Improve function utils_write_JSON_file()

Author: Wintermute0110

resources/db.py

@@ -1174,10 +1174,8 @@ def db_get_asset_cache_row(cfg, cache_index_dic, catalog_name, category_name):
 # -------------------------------------------------------------------------------------------------
 # Load and save a bunch of JSON files
 # -------------------------------------------------------------------------------------------------
-#
 # Accepts a list of JSON files to be loaded. Displays a progress dialog.
 # Returns a dictionary with the context of the loaded files.
-#
 def db_load_files(db_files):
     log_debug('db_load_files() Loading {} JSON database files...'.format(len(db_files)))
     db_dic = {}
@@ -1192,15 +1190,15 @@ def db_load_files(db_files):
 
     return db_dic
 
-def db_save_files(db_files, json_write_func = utils_write_JSON_file):
+def db_save_files(db_files):
     log_debug('db_save_files() Saving {} JSON database files...'.format(len(db_files)))
     d_text = 'Saving databases...'
     pDialog = KodiProgressDialog()
     pDialog.startProgress(d_text, len(db_files))
     for f_item in db_files:
         dict_data, db_name, db_path = f_item
         pDialog.updateProgressInc('{}\nDatabase [COLOR orange]{}[/COLOR]'.format(d_text, db_name))
-        json_write_func(db_path, dict_data)
+        utils_write_JSON_file(db_path, dict_data)
     pDialog.endProgress()
 
 # -------------------------------------------------------------------------------------------------

resources/mame.py

@@ -4955,12 +4955,6 @@ def mame_build_MAME_main_database(cfg, st_dic):
 
     # --- Save databases ---
     log_info('Saving database JSON files...')
-    if OPTION_LOWMEM_WRITE_JSON:
-        json_write_func = utils_write_JSON_file_lowmem
-        log_debug('Using utils_write_JSON_file_lowmem() JSON writer')
-    else:
-        json_write_func = utils_write_JSON_file
-        log_debug('Using utils_write_JSON_file() JSON writer')
     db_files = [
         [machines, 'MAME machines main', cfg.MAIN_DB_PATH.getPath()],
         [renderdb_dic, 'MAME render DB', cfg.RENDER_DB_PATH.getPath()],
@@ -4981,7 +4975,7 @@ def mame_build_MAME_main_database(cfg, st_dic):
         # --- Save control_dic after everything is saved ---
         [control_dic, 'Control dictionary', cfg.MAIN_CONTROL_PATH.getPath()],
     ]
-    db_save_files(db_files, json_write_func)
+    db_save_files(db_files)
 
     # Return a dictionary with references to the objects just in case they are needed after
     # this function (in "Build everything", for example). This saves time, because databases do not
@@ -5545,30 +5539,21 @@ def mame_build_ROM_audit_databases(cfg, st_dic, db_dic_in):
     db_safe_edit(control_dic, 't_MAME_Audit_DB_build', time.time())
 
     # --- Save databases ---
-    if OPTION_LOWMEM_WRITE_JSON:
-        json_write_func = utils_write_JSON_file_lowmem
-        log_debug('Using utils_write_JSON_file_lowmem() JSON writer')
-    else:
-        json_write_func = utils_write_JSON_file
-        log_debug('Using utils_write_JSON_file() JSON writer')
     db_files = [
         [audit_roms_dic, 'MAME ROM Audit', cfg.ROM_AUDIT_DB_PATH.getPath()],
         [machine_archives_dic, 'Machine file list', cfg.ROM_SET_MACHINE_FILES_DB_PATH.getPath()],
         # --- Save control_dic after everything is saved ---
         [control_dic, 'Control dictionary', cfg.MAIN_CONTROL_PATH.getPath()],
     ]
-    db_save_files(db_files, json_write_func)
+    db_save_files(db_files)
     # Add data generated in this function to dictionary for caller code use.
     db_dic_in['audit_roms'] = audit_roms_dic
     db_dic_in['machine_archives'] = machine_archives_dic
 
-#
 # Checks for errors before scanning for SL ROMs.
 # Display a Kodi dialog if an error is found.
 # Returns a dictionary of settings:
 # options_dic['abort'] is always present.
-# 
-#
 def mame_check_before_build_MAME_catalogs(cfg, st_dic, control_dic):
     kodi_reset_status(st_dic)
 
@@ -7232,12 +7217,6 @@ def mame_build_SoftwareLists_databases(cfg, st_dic, db_dic_in):
     db_safe_edit(control_dic, 't_SL_DB_build', time.time())
 
     # --- Save modified/created stuff in this function ---
-    if OPTION_LOWMEM_WRITE_JSON:
-        json_write_func = utils_write_JSON_file_lowmem
-        log_debug('Using utils_write_JSON_file_lowmem() JSON writer')
-    else:
-        json_write_func = utils_write_JSON_file
-        log_debug('Using utils_write_JSON_file() JSON writer')
     db_files = [
         # Fix this list of files!!!
         [SL_catalog_dic, 'Software Lists index', cfg.SL_INDEX_PATH.getPath()],
@@ -7246,18 +7225,16 @@ def mame_build_SoftwareLists_databases(cfg, st_dic, db_dic_in):
         # Save control_dic after everything is saved.
         [control_dic, 'Control dictionary', cfg.MAIN_CONTROL_PATH.getPath()],
     ]
-    db_save_files(db_files, json_write_func)
+    db_save_files(db_files)
     db_dic_in['SL_index'] = SL_catalog_dic
     db_dic_in['SL_machines'] = SL_machines_dic
     db_dic_in['SL_PClone_dic'] = SL_PClone_dic
 
 # -------------------------------------------------------------------------------------------------
 # ROM/CHD and asset scanner
 # -------------------------------------------------------------------------------------------------
-#
 # Checks for errors before scanning for SL ROMs.
 # Display a Kodi dialog if an error is found.
-#
 def mame_check_before_scan_MAME_ROMs(cfg, st_dic, options_dic, control_dic):
     log_info('mame_check_before_scan_MAME_ROMs() Starting...')
     kodi_reset_status(st_dic)

resources/utils.py

@@ -365,13 +365,13 @@ def utils_load_JSON_file(json_filename, default_obj = {}, verbose = True):
 # Note that there is a bug in the json module where the ensure_ascii=False flag can produce
 # a mix of unicode and str objects.
 # See http://stackoverflow.com/questions/18337407/saving-utf-8-texts-in-json-dumps-as-utf8-not-as-u-escape-sequence
-def utils_write_JSON_file(json_filename, json_data, verbose = True, pprint = False, lowmem = False):
+def utils_write_JSON_file(json_filename, json_data, verbose = True, pprint = False):
     l_start = time.time()
     if verbose: log_debug('utils_write_JSON_file() "{}"'.format(json_filename))
 
     # Choose JSON iterative encoder or normal encoder.
-    if lowmem:
-        if verbose: log_debug('utils_write_JSON_file() Using lowmem option')
+    if OPTION_LOWMEM_WRITE_JSON:
+        if verbose: log_debug('utils_write_JSON_file() Using OPTION_LOWMEM_WRITE_JSON option')
         if pprint:
             jobj = json.JSONEncoder(ensure_ascii = False, sort_keys = True,
                 indent = JSON_INDENT, separators = JSON_SEP)
@@ -396,7 +396,7 @@ def utils_write_JSON_file(json_filename, json_data, verbose = True, pprint = Fal
     # Write JSON to disk
     try:
         with io.open(json_filename, 'wt', encoding = 'utf-8') as file:
-            if lowmem:
+            if OPTION_LOWMEM_WRITE_JSON:
                 # Chunk by chunk JSON writer, uses less memory but takes longer.
                 for chunk in jobj.iterencode(json_data):
                     file.write(text_type(chunk))