bumped version number

Reviewed-on: #2

.idea/inspectionProfiles/Project_Default.xml

@@ -1,19 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="PyPep8Inspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="ignoredErrors">
-        <list>
-          <option value="E501" />
-        </list>
-      </option>
-    </inspection_tool>
-    <inspection_tool class="PyShadowingBuiltinsInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="ignoredNames">
-        <list>
-          <option value="format" />
-        </list>
-      </option>
-    </inspection_tool>
-  </profile>
-</component>

.idea/misc.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Black">
-    <option name="sdkName" value="Python 3.6 (pyuserconfig)" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 (pyuserconfig) (2)" project-jdk-type="Python SDK" />
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/pyuserconfig.iml" filepath="$PROJECT_DIR$/.idea/pyuserconfig.iml" />
-    </modules>
-  </component>
-</project>

.idea/pyuserconfig.iml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/venv" />
-    </content>
-    <orderEntry type="jdk" jdkName="Python 3.6 (pyuserconfig) (2)" jdkType="Python SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-  <component name="TestRunnerService">
-    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
-  </component>
-</module>

.idea/shelf/Uncommitted_changes_before_Checkout_at_29_03_2024_21_55_[Changes]/shelved.patch

@@ -1,40 +0,0 @@
-Index: .idea/pyuserconfig.iml
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<module type=\"PYTHON_MODULE\" version=\"4\">\n  <component name=\"NewModuleRootManager\">\n    <content url=\"file://$MODULE_DIR$\" />\n    <orderEntry type=\"jdk\" jdkName=\"Python 3.7 (pyuserconfig)\" jdkType=\"Python SDK\" />\n    <orderEntry type=\"sourceFolder\" forTests=\"false\" />\n  </component>\n  <component name=\"TestRunnerService\">\n    <option name=\"PROJECT_TEST_RUNNER\" value=\"Unittests\" />\n  </component>\n</module>
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/.idea/pyuserconfig.iml b/.idea/pyuserconfig.iml
---- a/.idea/pyuserconfig.iml	(revision cba08629cbfd9427213cb8e1719d2ce1e601bdfc)
-+++ b/.idea/pyuserconfig.iml	(date 1711709021136)
-@@ -1,8 +1,10 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <module type="PYTHON_MODULE" version="4">
-   <component name="NewModuleRootManager">
--    <content url="file://$MODULE_DIR$" />
--    <orderEntry type="jdk" jdkName="Python 3.7 (pyuserconfig)" jdkType="Python SDK" />
-+    <content url="file://$MODULE_DIR$">
-+      <excludeFolder url="file://$MODULE_DIR$/venv" />
-+    </content>
-+    <orderEntry type="inheritedJdk" />
-     <orderEntry type="sourceFolder" forTests="false" />
-   </component>
-   <component name="TestRunnerService">
-Index: .idea/misc.xml
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<project version=\"4\">\n  <component name=\"ProjectRootManager\" version=\"2\" project-jdk-name=\"Python 3.7 (pyuserconfig)\" project-jdk-type=\"Python SDK\" />\n</project>
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/.idea/misc.xml b/.idea/misc.xml
---- a/.idea/misc.xml	(revision cba08629cbfd9427213cb8e1719d2ce1e601bdfc)
-+++ b/.idea/misc.xml	(date 1711709021140)
-@@ -1,4 +1,4 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <project version="4">
--  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (pyuserconfig)" project-jdk-type="Python SDK" />
-+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 (pyuserconfig)" project-jdk-type="Python SDK" />
- </project>
-\ No newline at end of file

.idea/shelf/Uncommitted_changes_before_Checkout_at_29_03_2024_21_55__Changes_.xml

@@ -1,4 +0,0 @@
-<changelist name="Uncommitted_changes_before_Checkout_at_29_03_2024_21_55_[Changes]" date="1711745731399" recycled="true" deleted="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_29_03_2024_21_55_[Changes]/shelved.patch" />
-  <option name="DESCRIPTION" value="Uncommitted changes before Checkout at 29/03/2024 21:55 [Changes]" />
-</changelist>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

cli/__init__.py

@@ -15,7 +15,7 @@ class Debug:
     _COLOR_YELLOW = '\033[93m'
     _COLOR_END = '\33[0m'
 
-    _FORMAT = {'STANDARD': '',
+    _FORMAT = {'STANDARD': 'INFO: ',
                'ERROR': f'{_COLOR_RED}ERROR:{_COLOR_END} ',
                'NOTICE': f'{_COLOR_BLUE}NOTICE:{_COLOR_END} ',
                'WARNING': f'{_COLOR_YELLOW}WARNING:{_COLOR_END} ',
@@ -35,11 +35,15 @@ class Debug:
         return self._verbose
 
     def stdout(self, out, verbose_level=0, category='STANDARD'):
+        spaces = ''
+        if verbose_level > 1:
+            spaces = '   '*(verbose_level-1)
+
         if self._verbose >= verbose_level:
             if category in self._FORMAT:
-                print(f'{self._FORMAT[category]}{out}')
+                print(f'{spaces}{self._FORMAT[category]}{out}')
             else:
-                print(f'[category {category} unknown]:{out}')
+                print(f'{spaces}[category {category} unknown]:{out}')
 
     def stderr(self, out, verbose_level=0, category='STANDARD'):
         if self._verbose >= verbose_level:
@@ -72,13 +76,11 @@ def main():
                         dest='file', action='store')
     cmdline = parser.parse_args()
     debug = Debug()
-    # debug.set_verbose(cmdline.verbose)
-    # cfg = Conf(filename=cmdline.file, debug=debug)
-    debug.set_verbose(1)
-    cfg = Conf(filename='/home/lysis/userconfig2-test.conf', debug=debug)
+    debug.set_verbose(cmdline.verbose)
+    cfg = Conf(filename=cmdline.file, debug=debug)
     uc = Userconfig(cfg)
 
-    cfg.debug.stdout(f'Verbose level: {cfg.debug.get_verbose()}', 1, 'STANDARD')
+    cfg.debug.stdout(f'Verbose level: {cfg.debug.get_verbose()}', 1)
     configdir = cfg.get('configdir')
     # configdir is the root of the userconfig files
     # Directory structure:
@@ -107,20 +109,29 @@ def main():
 
     cfg.debug.stdout(f'configdir: {configdir}', 1)
     for package in os.scandir(configdir):
+        # Skip on non-production files
         if not package.is_dir():
             cfg.debug.stdout(f'{package.path} is not a directory, skipping', 2, 'WARNING')
             continue
         if package.name in ['.svn', '.git']:
             cfg.debug.stdout(f'{package.path} is a svn or git data directory, skipping', 2, 'WARNING')
+            continue
         if os.path.isfile(f'{package.path}/.ignore'):
             cfg.debug.stdout(f'{package.path} contains .ignore, skipping', 2, 'WARNING')
             continue
-        cfg.debug.stdout(f'Package: {package.path}', 1, 'NOTICE')
-        cfg.debug.stdout(f'============ start {cfg.debug.green(package.path)} ============', 2)
+        # Start processing
+        cfg.debug.stdout(f'Start Package {cfg.debug.green(package.path)}', 1, 'NOTICE')
+        # Get all category directories for package
         (category_dirs, dir_config) = uc.process_package_dir(package.path)
+        if not category_dirs:
+            cfg.debug.stdout(f'Could not get category_dirs for package {package.name}, skipping package.', 0, 'ERROR')
+            continue
+        if not dir_config:
+            cfg.debug.stdout(f'Could not get dir_config for package {package.name}, skipping package.', 0, 'ERROR')
+            continue
         cfg.debug.stdout(f'Got categories: {category_dirs}', 2)
         host_category_dirs = uc.filter_categories(category_dirs)
-        cfg.debug.stdout(f'Filtered categories for host: {host_category_dirs}', 2)
+        cfg.debug.stdout('Host uses categories: %s' % ", ".join([f'{v[1]}_{v[2]}' for v in host_category_dirs]), 2)
         file_list = dict()
         for c in host_category_dirs:
             file_list = uc.process_category_dir(c, file_list)
@@ -130,16 +141,26 @@ def main():
             subprocess.call([f'{package.path}/install.sh'])
         for file in file_list:
             dest = f'{dir_config.get(section="Main", option="dest")}/{file}'
+            cfg.debug.stdout('Generating %s from:\n      %s' % (dest, "\n      ".join(file_list[file])), 1)
+
             try:
                 comment_string = dir_config.get(section="Main", option="commentstring")
             except ValueError:
                 cfg.debug.stdout(f'commentstring does not exist in config file {dir_config._cfgfiles}', 0, 'ERROR')
                 sys.exit(1)
             # Make sure all directories for destination file exist
-            uc.create_destination_directories(dir_config.get(section="Main", option="dest"))
+            if uc.create_destination_directories(dir_config.get(section="Main", option="dest")):
+                cfg.debug.stdout(f'Created target directories {cfg.debug.green(dir_config.get(section="Main", option="dest"))}',
+                                 0, 'SUCCESS')
+            else:
+                cfg.debug.stdout(f'All target directories exist', 2)
             temp_filename = uc.build_file(file_list[file], dest, comment_string)
-            uc.diff_and_copy_file(temp_filename, dest, comment_string)
-        cfg.debug.stdout(f'============   end {cfg.debug.green(package.path)} ============\n\n', 2)
+            if uc.diff_and_copy_file(temp_filename, dest, comment_string):
+                cfg.debug.stdout(f'Copy {temp_filename} -> {cfg.debug.green(dest)} (changed)\n', 0, 'SUCCESS')
+            else:
+                cfg.debug.stdout(f'Generated file and destination are the same.\n', 1)
+
+        cfg.debug.stdout(f'End Package {cfg.debug.green(package.path)}\n\n', 1, 'NOTICE')
 
 
 if __name__ == '__main__':

install.sh

@@ -1,10 +1,11 @@
 #!/bin/sh
 
-if type pip3 >/dev/null 2>&1; then
-  pip3 install --user git+https://git.lys.is/lysis/pyuserconfig.git
+if type pipx >/dev/null 2>&1; then
+  pipx install git+https://git.lys.is/lysis/pyuserconfig.git
+  if [ ! -e ~/.userconfig ]; then
     git clone git@git.lys.is:lysis/userconfig.git ~/.userconfig
-  mkdir ~/.config
-  PYTHONPATH=~/.local/lib ~/.local/bin/userconfig.py
+  fi
+  userconfig
 else
-  echo "No pip3 installed, cannot proceed."
+  echo "No pipx installed, cannot proceed."
 fi

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "userconfig"
-version = "2.0b-1"
+version = "2.1"
 authors = [ {name = "Marcus Stoegbauer", email = "marcus@grmpf.org"} ]
 maintainers = [ {name = "Marcus Stoegbauer", email = "marcus@grmpf.org"} ]
 description = "Generate config files for user home"

userconfig/__init__.py

@@ -23,24 +23,24 @@ class Userconfig:
         :param package_dir: root of package directory
         :return: list of tuples (prio, category, value, path), sorted with prio
         """
-        self._cfg.debug.stdout(f'*** process package {package_dir}', 3)
+        self._cfg.debug.stdout(f'process package_dir {package_dir}', 3)
         package_config_file = f'{package_dir}/{self._cfg.get("configfile")}'
         if not os.path.isfile(package_config_file):
             self._cfg.debug.stdout(f'No config file {self._cfg.get("configfile")} in {package_dir}, skipping',
-                                   1, 'ERROR')
-            return None
+                                   0, 'ERROR')
+            return None, None
         dir_config = self.get_config(package_config_file)
         if not dir_config:
-            self._cfg.debug.stdout(f'Cannot read config file {package_config_file}, skipping', 1, 'ERROR')
-            return None
+            self._cfg.debug.stdout(f'Cannot read config file {package_config_file}, skipping', 0, 'ERROR')
+            return None, None
         classes = []
         for category in os.scandir(package_dir):
             if category.path == package_config_file:
                 continue
             if not category.is_dir():
-                self._cfg.debug.stdout(f'{category.path} is not a directory, skipping', 3, 'WARNING')
+                self._cfg.debug.stdout(f'{category.path} is not a directory, skipping', 3)
                 continue
-            self._cfg.debug.stdout(f'****** process category {category.path}', 3)
+            self._cfg.debug.stdout(f'process category {category.path}', 3)
             content = category.name.split('_')
             # Format: <number>_<category>_<value>
             if len(content) == 3:
@@ -52,14 +52,14 @@ class Userconfig:
                 category_name = content[1]
                 value = ''
             else:
-                self._cfg.debug.stdout(f'Format of package directory {category.path} wrong, skipping', 1, 'ERROR')
+                self._cfg.debug.stdout(f'Format of package directory {category.path} wrong, skipping', 0, 'ERROR')
                 continue
             try:
                 prio = int(prio_string)
             except ValueError:
-                self._cfg.debug.stdout(f'Cannot convert prio to integer ({category.path}, skipping', 1, 'ERROR')
+                self._cfg.debug.stdout(f'Cannot convert prio to integer ({category.path}, skipping', 0, 'ERROR')
                 continue
-            # self._cfg.debug.stdout(f'****** Got class: {(prio, category_name, value)}', 3)
+            # self._cfg.debug.stdout(f'Got class: {(prio, category_name, value)}', 3)
             classes.append((prio, category_name, value, category.path))
         classes.sort(key=lambda k: k[0])
         return classes, dir_config
@@ -74,7 +74,7 @@ class Userconfig:
         ret = []
         for c in categories:
             if not c[1]:
-                self._cfg.debug.stdout(f'category not set for {c[3]}, skipping', 3, 'WARNING')
+                self._cfg.debug.stdout(f'category not set for {c[3]}, skipping', 0, 'ERROR')
                 continue
             if check_class(c):
                 ret.append(c)
@@ -89,8 +89,11 @@ class Userconfig:
         :return:
         """
         (prio, category, value, category_dir) = category_dir_tuple
-        self._cfg.debug.stdout(f'*** process category {category_dir}', 3)
+        self._cfg.debug.stdout(f'process category {category_dir}', 3)
         for file in os.scandir(category_dir):
+            if file.name.endswith('.swp'):
+                self._cfg.debug.stdout(f'Ignoring swap file {file.name}', 3)
+                continue
             if file.name not in file_list:
                 file_list[file.name] = []
             file_list[file.name].append(file.path)
@@ -107,7 +110,7 @@ class Userconfig:
         """
 
         content = []
-        self._cfg.debug.stdout(f'*** building file for {dest_file}', 3)
+        self._cfg.debug.stdout(f'building file for {dest_file}', 3)
         if comment_string:
             content.append(f'{comment_string} {self._cfg.get("stamp")} {time.strftime("%+")}\n')
         for file in files:
@@ -124,7 +127,7 @@ class Userconfig:
         try:
             fp = os.fdopen(temp_fd, "w")
         except Exception as e:
-            self._cfg.debug.stderr(f"Cannot write to temporary file {temp_filename}: {e}", 0, 'ERROR')
+            self._cfg.debug.stderr(f'Cannot write to temporary file {temp_filename}: {e}', 0, 'ERROR')
             os.remove(temp_filename)
             return False
         self._cfg.debug.stdout(f'Writing merged files into temporary file {temp_filename}', 3)
@@ -135,38 +138,42 @@ class Userconfig:
         return temp_filename
 
     def diff_and_copy_file(self, temp_filename, dest_filename, comment_string):
+        ret = False
         if self.diff(dest_filename, temp_filename, comment_string):
-            self._cfg.debug.stdout(f"File {dest_filename} has changed", 0, 'NOTICE')
             if not self.user_config_generated(dest_filename):
-                self._cfg.debug.stdout(f"{dest_filename} not generated by userconfig, backing up.", 3)
+                self._cfg.debug.stdout(f'{dest_filename} not generated by userconfig, running back_up.', 3)
                 self.backup_file(dest_filename)
-            self._cfg.debug.stdout(f"Copy {temp_filename} to {dest_filename}", 0, 'NOTICE')
             self.copy_file(temp_filename, dest_filename)
-        self._cfg.debug.stdout(f"Removing temporary file {temp_filename}", 3)
+            ret = True
         os.remove(temp_filename)
+        self._cfg.debug.stdout(f'Removed temporary file {temp_filename}', 3, 'SUCCESS')
+        return ret
 
     def create_destination_directories(self, dest_directory):
-        self._cfg.debug.stdout(f'*** Creating {dest_directory} if needed', 3)
         path = Path(dest_directory)
         if not path.exists():
             path.mkdir(parents=True)
+            return True
+        else:
+            return False
 
     def get_config(self, filename):
         """reads filename as config, checks for DEST parameter and returns cfgfile object"""
         try:
             ret = Conf(filename=filename, debug=self._cfg.debug, force_filename=True)
         except ValueError:
-            self._cfg.debug.stderr("Error reading config file %s" % filename)
+            self._cfg.debug.stderr(f'Error reading config file {filename}', 0, 'ERROR')
             return False
         # check for DEST parameter
         if not ret.check(section="Main", option="dest"):
-            self._cfg.debug.stderr("No dest in config file %s" % filename)
+            self._cfg.debug.stderr(f'No dest in config file {filename}', 0, 'ERROR')
             return False
         # make sure DEST ends with /
         if not ret.get(section="Main", option="dest").endswith("/"):
             ret.set(section="Main", option="dest", value=ret.get(section="Main", option="dest")+"/")
         return ret
 
+    # FIXME remove, unused now
     @staticmethod
     def read_skip_comment(fp, comment_string):
         """Read line from filehandle fp and skip all empty (whitespace) lines and lines starting with comment_string
@@ -177,16 +184,15 @@ class Userconfig:
                     not re.match(r"^\s+$", line)):
                 yield line
 
-    def diff(self, dest_file, temp_file, comment_string):
+    # FIXME remove, unused now
+    def diff_old(self, dest_file, temp_file, comment_string):
         """diff dest_file and temp_file, returns True if files differ, False if they are the same"""
-        self._cfg.debug.stdout("Diffing %s and %s, comment: %s" % (dest_file, temp_file, comment_string), 3)
+        self._cfg.debug.stdout(f'Diffing {dest_file} and {temp_file}, comment: {comment_string}', 3)
         if not os.path.isfile(dest_file):
-            self._cfg.debug.stdout("Destination file %s does not exist, returning True." % dest_file, 3)
-            # dest_file does not exist -> copy temp_file over
+            self._cfg.debug.stdout(f'dest_file {dest_file} does not exist.', 3)
             return True
         if not os.path.isfile(temp_file):
-            # temp_file does not exist, this should never happen
-            self._cfg.debug.stderr("Temporary file %s does not exist, this should not happen." % temp_file)
+            self._cfg.debug.stderr(f'Temporary file {temp_file} does not exist, this should not happen.', 0, 'ERROR')
             sys.exit(1)
 
         fp1 = open(temp_file)
@@ -196,13 +202,42 @@ class Userconfig:
             if line1 != line2:
                 fp1.close()
                 fp2.close()
-                self._cfg.debug.stdout("%s differs, return true" % dest_file, 3)
+                self._cfg.debug.stdout(f'{dest_file} differs from generated config', 3)
                 return True
         fp1.close()
         fp2.close()
-        self._cfg.debug.stdout("%s is the same, return false" % dest_file, 3)
+        self._cfg.debug.stdout(f'{dest_file} is the same as generated config', 3)
         return False
 
+    @staticmethod
+    def sanitize_input(fp, comment_string):
+        """Read line from filehandle fp and skip all empty (whitespace) lines and lines starting with comment_string
+           return result as set
+        """
+        ret = set()
+        for line in fp:
+            line = line[:-1]
+            if ((comment_string != "" and not re.match("^"+re.escape(comment_string), line)) and line != "" and
+                    not re.match(r"^\s+$", line)):
+                ret.add(line)
+        return ret
+
+    def diff(self, dest_file, temp_file, comment_string):
+        """diff dest_file and temp_file, returns True if files differ, False if they are the same"""
+        self._cfg.debug.stdout(f'Diffing {dest_file} and {temp_file}, comment: {comment_string}', 3)
+        if not os.path.isfile(dest_file):
+            self._cfg.debug.stdout(f'dest_file {dest_file} does not exist.', 3)
+            return True
+        if not os.path.isfile(temp_file):
+            self._cfg.debug.stderr(f'Temporary file {temp_file} does not exist, this should not happen.', 0, 'ERROR')
+            sys.exit(1)
+
+        # get temp_file and dest_file, remove comments and whitespaces
+        temp_lines = self.sanitize_input(open(temp_file), comment_string)
+        dest_lines = self.sanitize_input(open(dest_file), comment_string)
+        # differences of temp_file and dest_file in both directions, if != 0: files differ
+        return len(temp_lines.symmetric_difference(dest_lines)) != 0
+
     def user_config_generated(self, filename):
         """returns True if filename has been generated by userconfig, False else"""
 
@@ -224,18 +259,18 @@ class Userconfig:
     def backup_file(self, filename):
         """make backup of filename, returns True if backup is successful, False else"""
         if os.path.isfile(filename):
-            self._cfg.debug.stdout("%s exists, finding backup name." % filename, 3)
+            self._cfg.debug.stdout(f'{filename} exists, finding backup name.', 3)
             backup_name = filename+".userconfig."+time.strftime("%F")
             test_backup_name = backup_name
             counter = 0
             while os.path.isfile(test_backup_name):
                 counter += 1
                 test_backup_name = backup_name+"."+str(counter)
-            self._cfg.debug.stdout("Renaming %s to %s" % (filename, test_backup_name), 1)
             os.rename(filename, test_backup_name)
+            self._cfg.debug.stdout(f'Renamed {filename} to {test_backup_name}', 1, 'SUCCESS')
             return True
         else:
-            self._cfg.debug.stdout("%s does not exist, do not need backup." % filename, 3)
+            self._cfg.debug.stdout(f'{filename} does not exist, do not need backup.', 3)
         return False
 
     def copy_file(self, sourcefile, dest_file):
@@ -243,11 +278,10 @@ class Userconfig:
 
         if os.path.isfile(sourcefile):
             # sourcefile exists
-            self._cfg.debug.stdout("Source file %s exists, proceeding with copy." % sourcefile, 3)
+            self._cfg.debug.stdout(f'Source file {sourcefile} exists, proceeding with copy.', 3)
             if not os.path.isfile(dest_file) or os.access(dest_file, os.W_OK):
-                self._cfg.debug.stdout("Copying %s to %s" % (sourcefile, dest_file), 1)
                 shutil.copy(sourcefile, dest_file)
                 return True
             else:
-                self._cfg.debug.stdout("Destination file %s does not exist or is not writable." % dest_file, 3)
+                self._cfg.debug.stdout('Destination {dest_file} is not a file or not writable.', 0, 'ERROR')
         return False

userconfig/checks.py

@@ -2,22 +2,33 @@ import platform
 
 
 def get_hostname():
-    hostname = platform.node()
-    if hostname.count("."):
-        hostname = hostname.split(".")[0]
-    return hostname
+    node_name = platform.node()
+    if node_name.count("."):
+        return node_name.split(".")[0]
+    else:
+        return node_name
 
 
 def get_arch():
     return platform.system()
 
 
+def get_domain():
+    node_name = platform.node()
+    if node_name.count("."):
+        return '.'.join(node_name.split('.')[1:])
+    else:
+        return ''
+
+
 def check_class(class_tuple):
     (prio, category, value, path) = class_tuple
     if category == 'Arch':
         return get_arch() == value
     elif category == 'Host':
         return get_hostname() == value
+    elif category == 'Domain':
+        return get_domain() == value
     elif value == '':           # if value is empty, we cannot filter anything, so it matches always
         return True
     else: