Service uploader can be in 'user modules' directory

Signed-off-by: Jim Easterbrook <jim@jim-easterbrook.me.uk>

src/pywws/__init__.py

@@ -1,3 +1,3 @@
 __version__ = '18.5.0'
-_release = '1532'
-_commit = 'ac9c014'
+_release = '1533'
+_commit = 'c66000a'

src/pywws/regulartasks.py

@@ -24,6 +24,7 @@
 import importlib
 import logging
 import os
+import sys
 
 from pywws.calib import Calib
 import pywws.plot
@@ -56,6 +57,8 @@ def __init__(self, context):
             'paths', 'graph_templates', os.path.expanduser('~/weather/graph_templates/'))
         self.local_dir = self.params.get(
             'paths', 'local_files', os.path.expanduser('~/weather/results/'))
+        self.module_dir = self.params.get(
+            'paths', 'modules', os.path.expanduser('~/weather/modules/'))
         # create calibration object
         self.calibrator = Calib(self.params, self.raw_data)
         # create templater object
@@ -90,24 +93,30 @@ def __init__(self, context):
                     self.cron[section].get_next()
         # create service uploader objects
         self.services = {}
+        sys.path.insert(0, self.module_dir)
         for section in list(self.cron.keys()) + [
                        'live', 'logged', 'hourly', '12 hourly', 'daily']:
             for name in eval(self.params.get(section, 'services', '[]')):
                 if name in self.services:
                     continue
+                mod = None
                 try:
                     mod = importlib.import_module('pywws.service.' + name)
-                    self.services[name] = getattr(mod, 'ToService')(context)
                 except ImportError:
-                    logger.error(
-                        'no uploader found for service "{:s}"'.format(name))
+                    try:
+                        mod = importlib.import_module(name)
+                    except ImportError:
+                        logger.error('no uploader found for service "{:s}"'.format(name))
+                if mod:
+                    self.services[name] = mod.ToService(context)
             # check for obsolete entries
             if self.params.get(section, 'twitter'):
                 logger.error(
                     'Obsolete twitter entry in weather.ini [%s]', section)
             if self.params.get(section, 'yowindow'):
                 logger.error(
                     'Obsolete yowindow entry in weather.ini [%s]', section)
+        del sys.path[0]
         # check for 'local' template results
         if os.path.isdir(self.local_dir):
             return