Merge pull request #29 from Teqniksoft/develop

Develop

Dockerfile

@@ -10,7 +10,4 @@ RUN pip install pymongo \
     dict_hash \
     requests
 	
-COPY ./ ./	
+COPY ./ ./
-
-RUN chmod 777 /app/configs/sources.json
-

configs/config.py

@@ -15,7 +15,8 @@ class AppConfig:
             username=CONFIGS['db']['username'],
             password=CONFIGS['db']['password'],
             authentication_source='admin',
-            host="mongodb://{host}:27017/{database}".format(host=CONFIGS['db']['host'], database=CONFIGS['db']['name'])
+            port=27017,
+            host=CONFIGS['db']['host']
         )
 	
     def refresh(self):
@@ -51,7 +52,7 @@ class AppConfig:
         new_config = {"sources": {}}
         for source in r.json():
             new_config["sources"][source["source_name"]] = source
-
+        
         with open("./configs/sources.json", "w") as outfile:
             outfile.write(json.dumps(new_config))
 			

update.py

@@ -35,16 +35,19 @@ class Updater:
 
     def do_action(self):
         print("Start Updater");
-        if self.args.config:
+        print("Start Configure")
-            print("Start Configure")
+        self.update_config()
-            self.update_config()
+        if hasattr(self.args, 'source') and self.is_source_exists(self.args.source):
-
+            print("Start single source" + self.args.source)
-        if not self.is_source_exists(self.args.source):
+            self.parse_source(self.args.source)
-            print("This source not exists, list of sources: " + ', '.join(config.get_sources_list()))
             return
 		
-        print("Start source update")
+        for source in config.get_sources_list():
-        self.parse_source(self.args.source)
+            try:
+                print("Start source update" + source)
+                self.parse_source(source)
+            except:
+                print(source + " has error")
 
 
 updater = Updater()