Database file name change after successful import

packageship/packageship/application/apps/package/function/searchdb.py

@@ -13,11 +13,12 @@ from packageship.libs.dbutils import DBHelper
 from packageship.libs.log import Log
 from packageship.application.models.package import bin_pack
 from packageship.libs.exception import ContentNoneException, Error
-from packageship.system_config import DATABASE_SUCCESS_FILE
+from packageship.system_config import DATABASE_FILE_INFO
 from .constants import ResponseCode
 
 LOGGER = Log(__name__)
 
+
 class SearchDB():
     """
     Description: query in database
@@ -57,7 +58,8 @@ class SearchDB():
             binary_list.remove(None)
         search_set = set(binary_list)
         if not search_set:
-            LOGGER.logger.warning("The input is None, please check the input value.")
+            LOGGER.logger.warning(
+                "The input is None, please check the input value.")
             return result_list
         for db_name, data_base in self.db_object_dict.items():
             try:
@@ -130,12 +132,13 @@ class SearchDB():
                 return ResponseCode.DIS_CONNECTION_DB, None
         return ResponseCode.PACK_NAME_NOT_FOUND, None, None, None
 
+
 def db_priority():
     """
     return dbprioty
     """
     try:
-        with open(DATABASE_SUCCESS_FILE, 'r', encoding='utf-8') as file_context:
+        with open(DATABASE_FILE_INFO, 'r', encoding='utf-8') as file_context:
 
             init_database_date = yaml.load(
                 file_context.read(), Loader=yaml.FullLoader)

packageship/packageship/application/apps/package/view.py

@@ -14,7 +14,7 @@ from packageship.libs.exception import Error
 from packageship.libs.exception import ContentNoneException
 from packageship.libs.exception import DataMergeException
 from packageship.libs.log import Log
-from packageship.system_config import DATABASE_SUCCESS_FILE
+from packageship.system_config import DATABASE_FILE_INFO
 from .function.constants import ResponseCode
 from .function.packages import get_packages
 from .function.packages import update_single_package
@@ -34,6 +34,7 @@ from .serialize import have_err_db_name
 LOGGER = Log(__name__)
 #pylint: disable = no-self-use
 
+
 class Packages(Resource):
     '''
     Description: interface for package info management
@@ -403,7 +404,7 @@ class Repodatas(Resource):
         changeLog:
         '''
         try:
-            with open(DATABASE_SUCCESS_FILE, 'r', encoding='utf-8') as file_context:
+            with open(DATABASE_FILE_INFO, 'r', encoding='utf-8') as file_context:
                 init_database_date = yaml.load(
                     file_context.read(), Loader=yaml.FullLoader)
                 if init_database_date is None:

packageship/packageship/application/initsystem/data_import.py

@@ -20,7 +20,7 @@ from packageship.application.models.temporarydb import src_requires
 from packageship.application.models.temporarydb import bin_package
 from packageship.application.models.temporarydb import bin_requiresment
 from packageship.application.models.temporarydb import bin_provides
-from packageship.system_config import DATABASE_SUCCESS_FILE
+from packageship.system_config import DATABASE_FILE_INFO
 from packageship.system_config import DATABASE_FOLDER_PATH
 
 LOGGER = Log(__name__)
@@ -498,9 +498,9 @@ class InitDataBase():
                 priority: priority
         '''
         try:
-            if not os.path.exists(DATABASE_SUCCESS_FILE):
-                pathlib.Path(DATABASE_SUCCESS_FILE).touch()
-            with open(DATABASE_SUCCESS_FILE, 'a+', encoding='utf8') as file_context:
+            if not os.path.exists(DATABASE_FILE_INFO):
+                pathlib.Path(DATABASE_FILE_INFO).touch()
+            with open(DATABASE_FILE_INFO, 'a+', encoding='utf8') as file_context:
                 setting_content = []
                 if 'database_content' in Kwargs.keys():
                     content = Kwargs.get('database_content')
@@ -523,8 +523,8 @@ class InitDataBase():
         modify record:
         '''
         try:
-            if os.path.exists(DATABASE_SUCCESS_FILE):
-                os.remove(DATABASE_SUCCESS_FILE)
+            if os.path.exists(DATABASE_FILE_INFO):
+                os.remove(DATABASE_FILE_INFO)
         except (IOError, Error) as exception_msg:
             LOGGER.logger.error(exception_msg)
             return False
@@ -544,14 +544,14 @@ class InitDataBase():
 
         if del_result:
             try:
-                file_read = open(DATABASE_SUCCESS_FILE, 'r', encoding='utf-8')
+                file_read = open(DATABASE_FILE_INFO, 'r', encoding='utf-8')
                 _databases = yaml.load(
                     file_read.read(), Loader=yaml.FullLoader)
                 for database in _databases:
                     if database.get('database_name') == db_name:
                         _databases.remove(database)
                 # Delete the successfully imported database configuration node
-                with open(DATABASE_SUCCESS_FILE, 'w+', encoding='utf-8') as file_context:
+                with open(DATABASE_FILE_INFO, 'w+', encoding='utf-8') as file_context:
                     yaml.safe_dump(_databases, file_context)
             except (IOError, Error) as del_config_error:
                 LOGGER.logger.error(del_config_error)

packageship/packageship/system_config.py

@@ -19,10 +19,7 @@ SYS_CONFIG_PATH = os.path.join('/', 'etc', 'pkgship', 'package.ini')
 
 # data file after successful data import
 
-# DATABASE_SUCCESS_FILE = os.path.join(
-#     BASE_PATH, 'application', 'initsystem', 'import_success_databse.yaml')
-
-DATABASE_SUCCESS_FILE = os.path.join(
+DATABASE_FILE_INFO = os.path.join(
     '/', 'var', 'run', 'database_file_info.yaml')
 
 # If the path of the imported database is not specified in the configuration file, the