[RELEASE] Version: 0.3.6

CHANGELOG

@@ -1,3 +1,15 @@
+python-dwho (0.3.6) unstable; urgency=medium
+
+  * [RELEASE] Version: 0.3.6
+
+ -- Adrien DELLE CAVE (Decryptus) <adc@doowan.net>  Mon, 18 Nov 2019 00:08:25 +0100
+
+python-dwho (0.3.5) unstable; urgency=medium
+
+  * Added method load_exclude_patterns.
+
+ -- Adrien DELLE CAVE (Decryptus) <adc@doowan.net>  Mon, 18 Nov 2019 00:05:39 +0100
+
 python-dwho (0.3.4) unstable; urgency=medium
 
   * Added method get_event_params.

RELEASE

@@ -1 +1 @@
-0.3.4
+0.3.6

VERSION

@@ -1 +1 @@
-0.3.4
+0.3.6

dwho/classes/inotify.py

@@ -67,6 +67,29 @@ def __init__(self,
 
 
 class DWhoInotifyConfig(object): # pylint: disable=useless-object-inheritance
+    @staticmethod
+    def load_exclude_patterns(exclude_files):
+        r = set()
+
+        if isinstance(exclude_files, six.string_types):
+            exclude_files = [exclude_files]
+        elif not isinstance(exclude_files, list):
+            LOG.error("invalid exclude_files type. (exclude_files: %r)",
+                      exclude_files)
+            exclude_files = []
+
+        for x in exclude_files:
+            pattern = helpers.load_patterns_from_file(x)
+            if not pattern:
+                raise DWhoConfigurationError("unable to load exclude patterns from %r." % x)
+
+            r.update(pattern)
+
+        if r:
+            return pyinotify.ExcludeFilter(list(r))
+
+        return None
+
     def __call__(self, notifier, conf):
         if 'plugins' not in conf:
             conf['plugins'] = DEFAULT_CONFIG['plugins'].copy()
@@ -131,19 +154,8 @@ def __call__(self, notifier, conf):
                     if exclude_file in value['exclude_files']:
                         value['exclude_files'].remove(exclude_file)
 
-            value['exclude_patterns']   = set()
-
             if value['exclude_files']:
-                for x in value['exclude_files']:
-                    pattern = helpers.load_patterns_from_file(x)
-                    if not pattern:
-                        raise DWhoConfigurationError("Unable to load exclude patterns from %r. (path: %r)"
-                                                     % (x, path))
-
-                    value['exclude_patterns'].update(pattern)
-
-            if value['exclude_patterns']:
-                value['exclude_patterns'] = pyinotify.ExcludeFilter(list(value['exclude_patterns']))
+                value['exclude_patterns'] = self.load_exclude_patterns(value['exclude_files'])
             else:
                 value['exclude_patterns'] = None
 

setup.yml

@@ -4,8 +4,8 @@ description: dwho
 author: Adrien Delle Cave
 author_email: pypi@doowan.net
 copyright: '2019 Adrien Delle Cave'
-release: '0.3.4'
-version: '0.3.4'
+release: '0.3.6'
+version: '0.3.6'
 license: License GPL-3
 url: https://github.com/decryptus/dwho
 python_requires: