Config refactoring

aore/updater/aodataparser.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import os
 
-from aore.config import folders
+from aore.config import Folders
 from aore.dbutils.dbschemas import db_shemas
 from aore.miscutils.exceptions import FiasException
 from aore.updater.xmlparser import XMLParser
@@ -16,8 +16,8 @@ class AoDataParser:
             self.allowed_fields = db_shemas[self.datasource.table_name].fields
 
         # Создаем временную папку, если ее нет
-        if not os.path.exists(folders.temp):
-            os.makedirs(folders.temp)
+        if not os.path.exists(Folders.temp):
+            os.makedirs(Folders.temp)
 
         self.pagesize = pagesize
         self.currentpage = 0
@@ -56,7 +56,7 @@ class AoDataParser:
         self.data_bereit_callback = data_callback
         self.currentpage = 0
         self.base_filename = \
-            folders.temp + "/fd_" + \
+            Folders.temp + "/fd_" + \
             str(self.datasource.operation_type) + "_" + \
             self.datasource.table_name + ".csv.part{}"
         self.counter = self.pagesize + 1

aore/updater/aorar.py

@@ -7,14 +7,14 @@ from traceback import format_exc
 import rarfile
 import requests
 
-from aore.config import folders, unrar_config
+from aore.config import Folders, UnrarConfig
 from aore.miscutils.exceptions import FiasException
 from aoxmltableentry import AoXmlTableEntry
 
 
 class AoRar:
     def __init__(self):
-        rarfile.UNRAR_TOOL = unrar_config.path
+        rarfile.UNRAR_TOOL = UnrarConfig.path
         self.fname = None
         self.mode = None
 
@@ -25,12 +25,12 @@ class AoRar:
     def download(self, url):
         logging.info("Downloading %s", url)
         try:
-            local_filename = os.path.abspath(folders.temp + "/" + url.split('/')[-1])
+            local_filename = os.path.abspath(Folders.temp + "/" + url.split('/')[-1])
             if os.path.isfile(local_filename):
                 os.remove(local_filename)
             else:
-                if not os.path.exists(folders.temp):
-                    os.makedirs(folders.temp)
+                if not os.path.exists(Folders.temp):
+                    os.makedirs(Folders.temp)
 
             request = requests.get(url, stream=True)
             with open(local_filename, 'wb') as f:

aore/updater/dbhandler.py

@@ -5,7 +5,7 @@ import logging
 import psycopg2
 from bottle import template
 
-from aore.config import db_conf
+from aore.config import DatabaseConfig
 from aore.dbutils.dbimpl import DBImpl
 from aore.dbutils.dbschemas import db_shemas
 from aore.updater.aoxmltableentry import AoXmlTableEntry
@@ -13,7 +13,7 @@ from aore.updater.aoxmltableentry import AoXmlTableEntry
 
 class DbHandler:
     def __init__(self):
-        self.db = DBImpl(psycopg2, db_conf)
+        self.db = DBImpl(psycopg2, DatabaseConfig)
 
     def bulk_csv(self, operation_type, table_name, processed_count, csv_file_name):
         sql_query = None

aore/updater/updater.py

@@ -5,7 +5,7 @@ from os import walk, path
 
 import psycopg2
 
-from aore.config import db_conf
+from aore.config import DatabaseConfig
 from aore.dbutils.dbimpl import DBImpl
 from aore.dbutils.dbschemas import allowed_tables, db_shemas
 from aore.updater.aodataparser import AoDataParser
@@ -36,7 +36,7 @@ class Updater:
     def get_current_fias_version(cls):
         db = None
         try:
-            db = DBImpl(psycopg2, db_conf)
+            db = DBImpl(psycopg2, DatabaseConfig)
             rows = db.get_rows('SELECT version FROM "CONFIG" WHERE id=0', True)
             assert len(rows) > 0, "Cannot get a version"
             return rows[0]['version']
@@ -48,7 +48,7 @@ class Updater:
 
     @classmethod
     def __set__update_version(cls, updver=0):
-        db = DBImpl(psycopg2, db_conf)
+        db = DBImpl(psycopg2, DatabaseConfig)
         try:
             assert isinstance(updver, int), "Update version must be of int type."
             db.execute('UPDATE "CONFIG" SET version={} WHERE id=0'.format(updver))
@@ -69,9 +69,10 @@ class Updater:
         return mode
 
     def __get_updates_from_folder(self, foldername):
-        # TODO: Вычислять версию, если берем данные из каталога
-        yield dict(intver=self.__get_update_version_from_console(),
-                   textver="Unknown", delta_url=foldername,
+        fias_db_version = self.__get_update_version_from_console()
+        yield dict(intver=fias_db_version,
+                   textver="Version {}".format(fias_db_version),
+                   delta_url=foldername,
                    complete_url=foldername)
 
     @staticmethod