Moved config class into separate file.

Moved Goodreads and LDAP services into separate package.

cps/updater.py

@@ -22,7 +22,6 @@ import sys
 import os
 import datetime
 import json
-import requests
 import shutil
 import threading
 import time
@@ -30,6 +29,7 @@ import zipfile
 from io import BytesIO
 from tempfile import gettempdir
 
+import requests
 from babel.dates import format_datetime
 from flask_babel import gettext as _
 
@@ -58,16 +58,14 @@ class Updater(threading.Thread):
         self.updateIndex = None
 
     def get_current_version_info(self):
-        if config.get_update_channel == constants.UPDATE_STABLE:
+        if config.config_updatechannel == constants.UPDATE_STABLE:
             return self._stable_version_info()
-        else:
-            return self._nightly_version_info()
+        return self._nightly_version_info()
 
     def get_available_updates(self, request_method):
-        if config.get_update_channel == constants.UPDATE_STABLE:
+        if config.config_updatechannel == constants.UPDATE_STABLE:
             return self._stable_available_updates(request_method)
-        else:
-            return self._nightly_available_updates(request_method)
+        return self._nightly_available_updates(request_method)
 
     def run(self):
         try:
@@ -430,10 +428,9 @@ class Updater(threading.Thread):
         return json.dumps(status)
 
     def _get_request_path(self):
-        if config.get_update_channel == constants.UPDATE_STABLE:
+        if config.config_updatechannel == constants.UPDATE_STABLE:
             return self.updateFile
-        else:
-            return _REPOSITORY_API_URL + '/zipball/master'
+        return _REPOSITORY_API_URL + '/zipball/master'
 
     def _load_remote_data(self, repository_url):
         status = {