Code Improvements and directory structure changes.

Makefile

@@ -2,7 +2,7 @@
 
 DO         := ./build/utils.sh
 SET_CONFIG := $(DO) set-config
-DESTDIR    ?= '/'
+DESTDIR    ?= /
 
 define colorecho
 	@tput setaf 118 || true
@@ -10,27 +10,55 @@ define colorecho
 	@tput sgr0      || true
 endef
 
+ifeq ($(MAKECMDGOALS),build_dev)
+debug_mode   := True
+decorated    := True
+stays_on_top := False
+endif
 
-all: install
 
-apply_config:
+# Configuration: Use values from command line if provided, default values otherwise.
-	@#            | KEY                 | VALUE FROM COMMAND LINE  | DEFAULT VALUE
+background_images_dir ?= $(realpath $(DESTDIR)/usr/share/backgrounds)
-	@$(SET_CONFIG) background_images_dir '$(background_images_dir)' /usr/share/backgrounds
+config_dir            ?= $(realpath $(DESTDIR)/etc/lightdm)
-	@$(SET_CONFIG) config_dir            '$(config_dir)'            /etc/lightdm
+debug_mode            ?= False
-	@$(SET_CONFIG) greeters_dir          '$(greeters_dir)'          /usr/share/xgreeters
+decorated             ?= False
-	@$(SET_CONFIG) locale_dir            '$(locale_dir)'            /usr/share/locale
+greeters_dir          ?= $(realpath $(DESTDIR)/usr/share/xgreeters)
-	@$(SET_CONFIG) themes_dir            '$(themes_dir)'            /usr/share/web-greeter
+locale_dir            ?= $(realpath $(DESTDIR)/usr/share/locale)
+themes_dir            ?= $(realpath $(DESTDIR)/usr/share/web-greeter/themes)
+logo_image            ?= $(themes_dir)/default/img/antergos-logo-user.png
+stays_on_top          ?= True
+user_image            ?= $(themes_dir)/default/img/antergos.png
+
 
-build_init: clean
+_apply_config:
+	@$(SET_CONFIG) background_images_dir $(background_images_dir)
+	@$(SET_CONFIG) config_dir            $(config_dir)
+	@$(SET_CONFIG) debug_mode            $(debug_mode)
+	@$(SET_CONFIG) decorated             $(decorated)
+	@$(SET_CONFIG) greeters_dir          $(greeters_dir)
+	@$(SET_CONFIG) locale_dir            $(locale_dir)
+	@$(SET_CONFIG) themes_dir            $(themes_dir)
+	@$(SET_CONFIG) logo_image            $(logo_image)
+	@$(SET_CONFIG) stays_on_top          $(stays_on_top)
+	@$(SET_CONFIG) user_image            $(user_image)
+
+_build_init: clean
 	$(DO) build-init
 
-build: build_init apply_config
+all: install
+
+build: _build_init _apply_config
 	$(DO) build
 
+build_dev: install
+	sudo $(DO) install-dev
+
 clean:
 	$(DO) clean
 
 install: build
-	$(DO) install $(DESTDIR)
+	sudo $(DO) install $(DESTDIR)
 	$(call colorecho, SUCCESS!)
 
+
+.PHONY: all _apply_config _build_init build build_dev clean install

build/utils.sh

@@ -31,7 +31,7 @@ do_build() {
 
 	# Compile Resources
 	(combine_javascript_sources \
-		&& pyrcc5 -o ../../resources.py ../resources.qrc)
+		&& pyrcc5 -o "${BUILD_DIR}/${PKGNAME}/resources.py" ../resources.qrc)
 
 	# Create "Zip Application"
 	(cd "${PKGNAME}" \
@@ -56,23 +56,27 @@ do_install() {
 		&& mv themes/_vendor .)
 
 	# Man Page
-	cp "${REPO_DIR}/dist/${PKGNAME}.1" "${INSTALL_ROOT}/usr/share/man/man1"
+	cp "${BUILD_DIR}/dist/${PKGNAME}.1" "${INSTALL_ROOT}/usr/share/man/man1"
 
 	# Greeter Config
-	cp "${REPO_DIR}/dist/${PKGNAME}.conf" "${INSTALL_ROOT}/etc/lightdm"
+	cp "${BUILD_DIR}/dist/${PKGNAME}.yml" "${INSTALL_ROOT}/etc/lightdm"
 
 	# AppData File
-	cp "${REPO_DIR}/dist/com.antergos.${PKGNAME}.appdata.xml" "${INSTALL_ROOT}/usr/share/metainfo"
+	cp "${BUILD_DIR}/dist/com.antergos.${PKGNAME}.appdata.xml" "${INSTALL_ROOT}/usr/share/metainfo"
 
 	# Desktop File
-	cp "${REPO_DIR}/dist/com.antergos.${PKGNAME}.desktop" "${INSTALL_ROOT}/usr/share/xgreeters"
+	cp "${BUILD_DIR}/dist/com.antergos.${PKGNAME}.desktop" "${INSTALL_ROOT}/usr/share/xgreeters"
 
 	# Do Install!
 	[[ -e "${DESTDIR}" ]] || mkdir -p "${DESTDIR}"
 	cp -R "${INSTALL_ROOT}"/* "${DESTDIR}"
 
 	# Fix Permissions
-	chown -R "${SUDO_UID}:${SUDO_GID}" "${BUILD_DIR}"
+	[[ -n "${SUDO_UID}" ]] && chown -R "${SUDO_UID}:${SUDO_GID}" "${BUILD_DIR}"
+}
+
+do_install_dev() {
+	cp -RH "${REPO_DIR}/whither/whither" /usr/lib/python3.6/site-packages/
 }
 
 do_success() {
@@ -88,18 +92,17 @@ generate_pot_file() {
 }
 
 init_build_dir() {
-	[[ -e "${BUILD_DIR}/web-greeter" ]] && return 0
+	[[ -e "${BUILD_DIR}/web-greeter" ]] && rm -rf "${BUILD_DIR}/web-greeter"
-	cp -R "${REPO_DIR}/web-greeter" "${BUILD_DIR}"
+	[[ -e "${BUILD_DIR}/dist" ]] && rm -rf "${BUILD_DIR}/dist"
+	cp -R -t "${BUILD_DIR}" "${REPO_DIR}/web-greeter" "${REPO_DIR}/dist"
 }
 
 set_config() {
-	( [[ -z "$1" ]] || [[ -z "$2" && -z "$3" ]] ) && return 1
+	[[ -z "$1" || -z "$2" ]] && return 1
-	local KEY VALUE
-
-	KEY="$1"
-	[[ '' != "$2" ]] && VALUE="$2" || VALUE="$3"
 
-	sed -i "s|@${KEY}@|${VALUE}|g" "${BUILD_DIR}/web-greeter/whither.yml"
+	sed -i "s|'@$1@'|$2|g" \
+		"${BUILD_DIR}/web-greeter/whither.yml" \
+		"${BUILD_DIR}/dist/web-greeter.yml"
 }
 
 
@@ -134,7 +137,11 @@ case "$1" in
 		do_install
 	;;
 
+	install-dev)
+		do_install_dev
+	;;
+
 	set-config)
-		set_config "$2" "$3" "$4"
+		set_config "$2" "$3"
 	;;
 esac

dist/web-greeter.conf

@@ -1,35 +0,0 @@
-#
-# [greeter]
-# debug_mode          = Greeter theme debug mode.
-# detect_theme_errors = Provide an option to load a fallback theme when theme errors are detected.
-# screensaver_timeout = Blank the screen after this many seconds of inactivity.
-# secure_mode         = Don't allow themes to make remote http requests.
-# time_format         = A moment.js format string so the greeter can generate localized time for display.
-# time_language       = Language to use when displaying the time or "auto" to use the system's language.
-# webkit_theme        = Webkit theme to use.
-#
-# NOTE: See moment.js documentation for format string options: http://momentjs.com/docs/#/displaying/format/
-#
-
-[greeter]
-debug_mode          = false
-detect_theme_errors = true
-screensaver_timeout = 300
-secure_mode         = true
-time_format         = LT
-time_language       = auto
-webkit_theme        = antergos
-
-#
-# [branding]
-# background_images = Path to directory that contains background images for use by themes.
-# logo              = Path to logo image for use by greeter themes.
-# user_image        = Default user image/avatar. This is used by themes for users that have no .face image.
-#
-# NOTE: Paths must be accessible to the lightdm system user account (so they cannot be anywhere in /home)
-#
-
-[branding]
-background_images = /usr/share/backgrounds
-logo              = /usr/share/lightdm-webkit/themes/antergos/img/antergos.png
-user_image        = /usr/share/lightdm-webkit/themes/antergos/img/antergos-logo-user.png

dist/web-greeter.yml

@@ -0,0 +1,33 @@
+#
+# branding:
+#     background_images_dir: Path to directory that contains background images for use by themes.
+#     logo_image:            Path to logo image for use by greeter themes.
+#     user_image:            Default user image/avatar. This is used by themes when user has no .face image.
+#
+# NOTE: Paths must be accessible to the lightdm system user account (so they cannot be anywhere in /home)
+#
+branding:
+    background_images_dir: '@background_images_dir@'
+    logo_image: '@logo_image@'
+    user_image: '@user_image@'
+
+#
+# greeter:
+#     debug_mode:          Enable debug mode for the greeter as well as greeter themes.
+#     detect_theme_errors: Provide an option to load a fallback theme when theme errors are detected.
+#     screensaver_timeout: Blank the screen after this many seconds of inactivity.
+#     secure_mode:         Don't allow themes to make remote http requests.
+#     theme:               Greeter theme to use.
+#     time_format:         A moment.js format string so the greeter can generate localized time for display.
+#     time_language:       Language to use when displaying the time or "auto" to use the system's language.
+#
+# NOTE: See moment.js documentation for format string options: http://momentjs.com/docs/#/displaying/format
+#
+greeter:
+    debug_mode: '@debug_mode@'
+    detect_theme_errors: True
+    screensaver_timeout: 300
+    secure_mode: True
+    theme: default
+    time_format: LT
+    time_language: auto

themes/default/index.html

@@ -38,16 +38,16 @@
 	<!--<script type="text/javascript" src="../_vendor/js/mock.js"></script>-->
 
 	<!-- Vendor CSS -->
-	<link rel="stylesheet" type="text/css" href="../_vendor/css/bootswatch-paper.bootstrap.min.css"/>
+	<link rel="stylesheet" type="text/css" href="../../_vendor/css/bootswatch-paper.bootstrap.min.css"/>
-	<link rel="stylesheet" type="text/css" href="../_vendor/fonts/font-awesome/font-awesome.min.css"/>
+	<link rel="stylesheet" type="text/css" href="../../_vendor/fonts/font-awesome/font-awesome.min.css"/>
 
 	<!-- Theme's CSS -->
 	<link rel="stylesheet" type="text/css" href="css/style.css">
 
 	<!-- Vendor JavaScript -->
-	<script src="../_vendor/js/jquery.min.js"></script>
+	<script src="../../_vendor/js/jquery.min.js"></script>
-	<script src="../_vendor/js/bootstrap.min.js"></script>
+	<script src="../../_vendor/js/bootstrap.min.js"></script>
-	<script src="../_vendor/js/js.cookie.min.js"></script>
+	<script src="../../_vendor/js/js.cookie.min.js"></script>
 
 	<!-- Theme JavaScript -->
 	<script src="js/translations.js"></script>

themes/default/js/greeter.js

@@ -248,7 +248,7 @@ class BackgroundManager {
 	 * @param {jQuery.Deferred} deferred
 	 */
 	initialize( deferred ) {
-		if ( ! _bg_self.current_background ) {
+		if ( is_empty( _bg_self.current_background ) ) {
 			_bg_self.random_background = _config._set( 'true', 'background_manager', 'random_background' );
 		}
 

web-greeter/bridge/Config.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 #  Config.py

web-greeter/bridge/ThemeUtils.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 #  ThemeUtils.py
@@ -40,11 +39,10 @@ from whither.bridge import (
 
 class ThemeUtils(BridgeObject):
 
-    def __init__(self, greeter, config, user_config, *args, **kwargs):
+    def __init__(self, greeter, config, *args, **kwargs):
         super().__init__(name='ThemeUtils', *args, **kwargs)
 
         self._config = config
-        self._user_config = user_config
         self._greeter = greeter
 
     @bridge.method(str, bool, result=Variant)
@@ -60,9 +58,9 @@ class ThemeUtils(BridgeObject):
         allowed = False
         allowed_dirs = (
             self._config.themes_dir,
-            self._user_config.branding.background_images,
+            self._config.branding.background_images_dir,
             self._greeter.shared_data_directory,
-            '/tmp/'
+            '/tmp'
         )
 
         for allowed_dir in allowed_dirs:

web-greeter/greeter.py

@@ -27,12 +27,17 @@
 #  along with Web Greeter; If not, see <http://www.gnu.org/licenses/>.
 
 # Standard Lib
-import configparser
 import os
+from typing import (
+    ClassVar,
+    Type,
+)
 
 # 3rd-Party Libs
 from whither.app import App
 from whither.base.data import AttributeDict
+from whither.base.config_loader import ConfigLoader
+from whither.bridge import BridgeObject
 
 # This Application
 import resources
@@ -42,48 +47,44 @@ from bridge import (
     ThemeUtils,
 )
 
+# Typing Helpers
+BridgeObj = Type[BridgeObject]
+
 
 BASE_DIR = os.path.dirname(os.path.realpath(__file__))
 CONFIG_FILE = os.path.join(BASE_DIR, 'whither.yml')
 
 
 class WebGreeter(App):
-    greeter = None
+    greeter = None         # type: ClassVar[BridgeObj]
-    greeter_config = None
+    greeter_config = None  # type: ClassVar[BridgeObj]
-    theme_utils = None
+    theme_utils = None     # type: ClassVar[BridgeObj]
-    user_config = AttributeDict({})
 
     def __init__(self, *args, **kwargs):
-        super().__init__('WebGreeter', config_file=CONFIG_FILE, debug=True, *args, **kwargs)
+        super().__init__('WebGreeter', *args, **kwargs)
-        self.get_and_save_user_config()
 
         self.greeter = Greeter(self.config.themes_dir)
-        self.greeter_config = Config(self.user_config)
+        self.greeter_config = Config(self.config)
-        self.theme_utils = ThemeUtils(self.greeter, self.config, self.user_config)
+        self.theme_utils = ThemeUtils(self.greeter, self.config)
         self._web_container.bridge_objects = (self.greeter, self.greeter_config, self.theme_utils)
 
         self._web_container.initialize_bridge_objects()
         self._web_container.load_script(':/_greeter/js/bundle.js', 'Web Greeter Bundle')
         self.load_theme()
 
-    def get_and_save_user_config(self):
+    def _before_web_container_init(self):
-        config = configparser.ConfigParser()
+        self.get_and_apply_user_config()
 
-        config.read('/etc/lightdm/web-greeter.conf')
+    def get_and_apply_user_config(self):
+        config_file = os.path.join(self.config.config_dir, 'web-greeter.yml')
+        branding_config = ConfigLoader('branding', config_file).config
+        greeter_config = ConfigLoader('greeter', config_file).config
 
-        for section in config.sections():
+        self.config.branding.update(branding_config)
-            self.user_config[section] = {}
+        self.config.greeter.update(greeter_config)
-
-            for key in config[section]:
-                self.user_config[section][key] = config[section][key]
 
     def load_theme(self):
-        theme_url = 'file://{0}/{1}/index.html'.format(
+        theme_url = f'/{self.config.themes_dir}/{self.config.greeter.theme}/index.html'
-            self.config.themes_dir,
-            'antergos'
-            #self.user_config.greeter.webkit_theme
-        )
-
         self._web_container.load(theme_url)
 
 

web-greeter/resources/js/ThemeUtils.js

@@ -35,9 +35,9 @@ let localized_invalid_date = null,
 
 function _set_allowed_dirs() {
 	allowed_dirs = {
-		themes_dir: lightdm.themes_directory,
+		themes_dir: lightdm.themes_dir,
-		backgrounds_dir: greeter_config.branding.background_images,
+		backgrounds_dir: greeter_config.branding.background_images_dir,
-		lightdm_data_dir: lightdm.shared_data_directory,
+		lightdm_data_dir: lightdm.shared_data_dir,
 		tmpdir: '/tmp',
 	};
 }

web-greeter/whither.yml

@@ -4,34 +4,42 @@
 WebGreeter:
     # Whither's Config
     whither:
+        allow_remote_urls: False
         app_id: com.antergos.web-greeter
-        toolkit: auto
+        debug_mode: '@debug_mode@'
         entry_point:
             autoload: False
-            url: ''
+        toolbar:
+            enabled: False
+        toolkit: auto
         window:
-            width:
+            decorated: '@decorated@'
-            height:
             initial_state: maximized
-            decorated: False
+            stays_on_top: '@stays_on_top@'
-            stays_on_top: True
             title: Web Greeter for LightDM
-            icon:
-            no_desktop_env: False
-        toolbar:
-            enabled: False
 
     # App's Config
     app:
-        background_images_dir: '@background_images_dir@'
+        branding:
+            background_images_dir: '@background_images_dir@'
+            logo_image: '@logo_image@'
+            user_image: '@user_image@'
         config_dir: '@config_dir@'
+        greeter:
+            debug_mode: '@debug_mode@'
+            detect_theme_errors: True
+            screensaver_timeout: 300
+            secure_mode: True
+            theme: default
+            time_format: LT
+            time_language: auto
         greeters_dir: '@greeters_dir@'
         locale_dir: '@locale_dir@'
-        logo_image: '@logo_image@'
         themes_dir: '@themes_dir@'
-        user_image: '@user_image@'
         version:
-            full: '3.0.0alpha3'
+            full: '3.0.0alpha4'
-            major: '3'
+            major: 3
-            minor: '0'
+            minor: 0
-            micro: '0alpha3'
+            micro: 0
+            alpha: 4
+            beta: False