Merge branch 'main' of https://github.com/zach-morris/plugin.program.iagl

Author: zach-morris

resources/lib/common.py

@@ -209,7 +209,7 @@ def update_game_dl_path(self,path_in=None,new_folder=None):
 	def extract_addon_db(self,use_backup=False):
 		success = False
 		if use_backup:
-			current_file = self.config.files.get('addon_data_db_zipped_backup')
+			current_file = self.config.files.get('db_zipped_backup')
 		else:
 			current_file = self.config.files.get('addon_data_db_zipped')
 		if current_file.exists():
@@ -266,7 +266,8 @@ def check_db(self):
 							new_matches = []
 							no_matches = []
 							xbmc.log(msg='IAGL: Extracted zipped db with version {} to path {}'.format(self.config.addon.get('version'),str(self.config.files.get('db').parent)),level=xbmc.LOGDEBUG)
-							self.config.files.get('addon_data_db_zipped').rename(self.config.files.get('addon_data_db_zipped_backup'))  #Rename new zipped db to backup
+							#Rename or copy new zipped db to backup
+							self._move_or_copy_zipped_db()
 							if old_uids is not None:
 								new_uids = db.query_db(db.get_query('get_all_uids_in_new_db',old_uids=','.join(['"{}"'.format(x) for x in old_uids])),return_as='dict')
 								no_match_uids = [x for x in old_uids if x not in [y.get('uid') for y in new_uids if isinstance(y.get('uid'),str)]]
@@ -380,7 +381,7 @@ def check_db(self):
 						selected = xbmcgui.Dialog().select(heading=self.get_loc(30373),list=[self.get_loc(30377),self.get_loc(30378)],useDetails=False)
 						if selected == 1:
 							xbmc.log(msg='IAGL:  User requested not to be asked about update again.  Moving new db to backup.',level=xbmc.LOGDEBUG)
-							self.config.files.get('addon_data_db_zipped').rename(self.config.files.get('addon_data_db_zipped_backup'))
+							self._move_or_copy_zipped_db()
 						else:
 							xbmc.log(msg='IAGL:  User will be asked about update again later...',level=xbmc.LOGDEBUG)
 				else:
@@ -394,7 +395,7 @@ def check_db(self):
 				if result:
 					xbmcaddon.Addon(id=self.config.addon.get('addon_name')).setSetting(id='db_version',value=self.config.addon.get('version'))
 					xbmc.log(msg='IAGL: Extracted zipped db with version {} to path {}'.format(self.config.addon.get('version'),str(self.config.files.get('db').parent)),level=xbmc.LOGDEBUG)
-					self.config.files.get('addon_data_db_zipped').rename(self.config.files.get('addon_data_db_zipped_backup'))
+					self._move_or_copy_zipped_db()
 				else:
 					xbmc.log(msg='IAGL:  Error extracting addon db: {}'.format(self.config.files.get('addon_data_db_zipped')),level=xbmc.LOGERROR)
 			else:
@@ -404,14 +405,23 @@ def check_db(self):
 					xbmc.log(msg='IAGL: addon database file not found, unable to restore from backup.',level=xbmc.LOGERROR)
 		return result
 
+	def _move_or_copy_zipped_db(self):
+		try:
+			self.config.files.get('addon_data_db_zipped').rename(self.config.files.get('db_zipped_backup'))
+		except Exception:
+			try:
+				xbmcvfs.copy(str(self.config.files.get('addon_data_db_zipped')), str(self.config.files.get('db_zipped_backup')))
+			except Exception as e:
+				xbmc.log(msg='IAGL: Error creating a backup of the db: {}'.format(e),level=xbmc.LOGERROR)
+
 	def reset_db(self):
 		result = False
 		xbmc.log(msg='IAGL: userdata db reset requested',level=xbmc.LOGDEBUG)
 		pDialog = xbmcgui.DialogProgressBG()
 		pDialog.create('Please Wait','Reset in progress...')
 		if self.config.files.get('addon_data_db_zipped').exists():
 			use_backup=False  #Use the non-backup if it exists
-		elif self.config.files.get('addon_data_db_zipped_backup').exists():
+		elif self.config.files.get('db_zipped_backup').exists():
 			use_backup=True  #If it doesnt exist (likely), use the backup version
 		else:
 			use_backup = None

resources/lib/config.py

@@ -46,9 +46,8 @@ def __init__(self):
 		self.paths['assets_url'] = 'special://home/addons/plugin.program.iagl/assets/default/{}'
 
 		#Files
-		self.files['addon_data_db'] = self.paths['addon_data'].joinpath('iagl.db')
 		self.files['addon_data_db_zipped'] = self.paths['addon_data'].joinpath('iagl.db.zip')
-		self.files['addon_data_db_zipped_backup'] = self.paths['addon_data'].joinpath('iagl_backup.db.zip')
+		self.files['db_zipped_backup'] = self.paths['userdata'].joinpath('iagl_backup.db.zip')
 		self.files['db'] = self.paths['userdata'].joinpath('iagl.db')
 		self.files['ia_cookie'] = self.paths['userdata'].joinpath('ia.cookie')
 		self.files['sounds'] = dict()