Merge 3a50fc5bb5 into 76a6aa3bca

Added translation using Weblate (Hebrew (Israel))

Added translation using Weblate (French (Canada))

Added translation using Weblate (Dari)

Added translation using Weblate (English (United States))

Added translation using Weblate (English (New Zealand))

Added translation using Weblate (English (Australia))

Added translation using Weblate (Arabic)

Translated using Weblate (Slovak (sk_sk))

Currently translated at 38.5% (59 of 153 strings)

Translated using Weblate (Czech (cs_cz))

Currently translated at 100.0% (153 of 153 strings)

Translated using Weblate (German (de_de))

Currently translated at 100.0% (153 of 153 strings)

Translated using Weblate (Estonian (et_ee))

Currently translated at 100.0% (153 of 153 strings)

Translated using Weblate (Italian (it_it))

Currently translated at 100.0% (153 of 153 strings)

Translated using Weblate (Chinese (China) (zh_cn))

Currently translated at 100.0% (153 of 153 strings)

Translated using Weblate (Danish (da_dk))

Currently translated at 100.0% (153 of 153 strings)

Translated using Weblate (Russian (ru_ru))

Currently translated at 99.3% (152 of 153 strings)

Translated using Weblate (Korean (ko_kr))

Currently translated at 100.0% (153 of 153 strings)

Translated using Weblate (Spanish (Spain) (es_es))

Currently translated at 100.0% (153 of 153 strings)

Translated using Weblate (Polish (pl_pl))

Currently translated at 100.0% (153 of 153 strings)

Translated using Weblate (Italian (it_it))

Currently translated at 100.0% (153 of 153 strings)

Translated using Weblate (Finnish (fi_fi))

Currently translated at 100.0% (153 of 153 strings)

Co-authored-by: Christian Gade <gade@kodi.tv>
Co-authored-by: HansCR <h.vanek@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: José Antonio Alvarado <jalvarado0.eses@gmail.com>
Co-authored-by: Kai Sommerfeld <ksooo@users.noreply.kodi.weblate.cloud>
Co-authored-by: Marek Adamski <fevbew@wp.pl>
Co-authored-by: Massimo Pissarello <mapi68@gmail.com>
Co-authored-by: Minho Park <parkmino@gmail.com>
Co-authored-by: Oskari Lavinto <olavinto@protonmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: rimasx <riks_12@hot.ee>
Co-authored-by: taxigps <taxigps@sina.com>
Co-authored-by: vgbsd <vg72i@protonmail.com>
Translate-URL: https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/cs_cz/
Translate-URL: https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/da_dk/
Translate-URL: https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/de_de/
Translate-URL: https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/es_es/
Translate-URL: https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/et_ee/
Translate-URL: https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/fi_fi/
Translate-URL: https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/it_it/
Translate-URL: https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/ko_kr/
Translate-URL: https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/pl_pl/
Translate-URL: https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/ru_ru/
Translate-URL: https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/sk_sk/
Translate-URL: https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/zh_cn/
Translation: Kodi add-ons: scripts/script.xbmcbackup

resources/lib/backup.py

@@ -414,9 +414,9 @@ class XbmcBackup:
                 if(utils.getSettingBool('verbose_logging')):
                     utils.log('Writing file: ' + aFile['file'])
 
-                if(aFile['is_dir']):
+                if(aFile['file'].startswith("-")):
                     self._updateProgress('%s remaining\nwriting %s' % (utils.diskString(self.transferLeft), os.path.basename(aFile['file'][len(source.root_path):]) + "/"))
-                    dest.mkdir(dest.root_path + aFile['file'][len(source.root_path):])
+                    dest.mkdir(dest.root_path + aFile['file'][len(source.root_path) + 1:])
                 else:
                     self._updateProgress('%s remaining\nwriting %s' % (utils.diskString(self.transferLeft), os.path.basename(aFile['file'][len(source.root_path):])))
                     self.transferLeft = self.transferLeft - aFile['size']
@@ -426,7 +426,6 @@ class XbmcBackup:
 
                     # if result is still true but this file failed
                     if(not wroteFile and result):
-                        utils.log("Failed to write " + aFile['file'])
                         result = False
 
         return result
@@ -584,7 +583,7 @@ class FileManager:
     def walk(self):
 
         for aDir in self.root_dirs:
-            self.addFile(xbmcvfs.translatePath(aDir['path']), True)
+            self.addFile('-' + xbmcvfs.translatePath(aDir['path']))
             self.walkTree(xbmcvfs.translatePath(aDir['path']), aDir['recurse'])
 
     def walkTree(self, directory, recurse=True):
@@ -606,7 +605,7 @@ class FileManager:
                     # check if directory is excluded
                     if(not any(dirPath.startswith(exDir) for exDir in self.exclude_dir)):
 
-                        self.addFile(dirPath, True)
+                        self.addFile("-" + dirPath)
 
                         # catch for "non directory" type files
                         shouldWalk = True
@@ -629,7 +628,7 @@ class FileManager:
         else:
             self.excludeFile(xbmcvfs.translatePath(dirMeta['path']))
 
-    def addFile(self, filename, is_dir = False):
+    def addFile(self, filename):
         # write the full remote path name of this file
         if(utils.getSettingBool('verbose_logging')):
             utils.log("Add File: " + filename)
@@ -638,7 +637,7 @@ class FileManager:
         fSize = self.vfs.fileSize(filename)
         self.totalSize = self.totalSize + fSize
 
-        self.fileArray.append({'file': filename, 'size': fSize, 'is_dir': is_dir})
+        self.fileArray.append({'file': filename, 'size': fSize})
 
     def excludeFile(self, filename):
         # remove trailing slash