version bump

closes #228

addon.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.xbmcbackup"
-    name="Backup" version="1.7.0~beta2" provider-name="robweber">
+    name="Backup" version="1.7.0" provider-name="robweber">
   <requires>
     <import addon="xbmc.python" version="3.0.0"/>
     <import addon="script.module.dateutil" version="2.8.0" />
@@ -29,6 +29,7 @@ Can add suffix to backup folder names
 translations sync
 Minor UI fixes
 Fixed Dropbox tokens expiring by using refresh tokens
+Always recommend restart after a restore
 </news>
     <summary lang="ar_SA">إنسخ إحتياطياً قاعده بيانات إكس بى إم سى وملفات اﻹعدادات فى حاله وقوع إنهيار مع إمكانيه اﻹسترجاع</summary>
     <summary lang="bg_BG">Добавката може да създава резервни копия и възстановява базата данни и настройките на Kodi, в случай на срив или повреда на файловете.</summary>

changelog.md

@@ -4,12 +4,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
-## Unreleased
+## [Version 1.7.0](https://github.com/robweber/xbmcbackup/compare/matrix-1.6.8...robweber:matrix-1.7.0)
 
 ### Added
 
 - You can now append a suffix to the end of each backup name (folder or zip file). This is only available in the Advanced or Expert settings.
 - validation file now saves a list of all installed addons and versions
+- prompt to close Kodi at the end of successful restore
 
 ### Changed
 
@@ -17,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - modified GitHub issue template slightly
 - translations sync
 - token files are stored in a `.json` instead of a `.txt` file
+- file discovery process now flags directories with an `is_dir` metadata property instead of prefixing with a dash (-). This was done for legacy reasons and there is no reason for it.
 
 ### Fixed
 

resources/language/resource.language.cs_cz/strings.po

@@ -8,17 +8,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: XBMC Addons\n"
-"Report-Msgid-Bugs-To: translations@kodi.tv\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2023-09-07 11:11+0000\n"
+"PO-Revision-Date: 2022-03-28 15:13+0000\n"
-"Last-Translator: HansCR <h.vanek@gmail.com>\n"
+"Last-Translator: Kryštof Černý <cleverline1mc@gmail.com>\n"
 "Language-Team: Czech <https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/cs_cz/>\n"
 "Language: cs_cz\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 4.18.2\n"
+"X-Generator: Weblate 4.11.2\n"
 
 msgctxt "Addon Summary"
 msgid "Backup and restore your Kodi database and configuration files in the event of a crash or file corruption."
@@ -626,11 +626,11 @@ msgstr "Záloha spuštěna v neznámém režimu"
 
 msgctxt "#30160"
 msgid "Backup Filename Suffix"
-msgstr "Přípona záložního souboru"
+msgstr ""
 
 msgctxt "#30161"
 msgid "Amend a string to the end of each backup folder or ZIP file"
-msgstr "Úprava řetězce na konci každé složky nebo souboru ZIP se zálohou"
+msgstr ""
 
 #~ msgctxt "#30036"
 #~ msgid "Custom Directory 1"

resources/language/resource.language.da_dk/strings.po

@@ -10,9 +10,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: XBMC Addons\n"
-"Report-Msgid-Bugs-To: translations@kodi.tv\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2023-04-24 13:16+0000\n"
+"PO-Revision-Date: 2022-06-08 21:14+0000\n"
 "Last-Translator: Christian Gade <gade@kodi.tv>\n"
 "Language-Team: Danish <https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/da_dk/>\n"
 "Language: da_dk\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.15.2\n"
+"X-Generator: Weblate 4.12.2\n"
 
 msgctxt "Addon Summary"
 msgid "Backup and restore your Kodi database and configuration files in the event of a crash or file corruption."
@@ -628,11 +628,11 @@ msgstr "Sikkerhedskopiering startede med ukendt tilstand"
 
 msgctxt "#30160"
 msgid "Backup Filename Suffix"
-msgstr "Backup filnavnsuffiks"
+msgstr ""
 
 msgctxt "#30161"
 msgid "Amend a string to the end of each backup folder or ZIP file"
-msgstr "Tilføj en streng til slutningen af hver backupmappe eller ZIP-fil"
+msgstr ""
 
 #~ msgctxt "#30036"
 #~ msgid "Custom Directory 1"

resources/language/resource.language.de_de/strings.po

@@ -19,17 +19,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: XBMC Addons\n"
-"Report-Msgid-Bugs-To: translations@kodi.tv\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2023-08-27 22:11+0000\n"
+"PO-Revision-Date: 2023-02-01 13:15+0000\n"
-"Last-Translator: Kai Sommerfeld <ksooo@users.noreply.kodi.weblate.cloud>\n"
+"Last-Translator: Demian <Demian@gmx.co.uk>\n"
 "Language-Team: German <https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/de_de/>\n"
 "Language: de_de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.18.2\n"
+"X-Generator: Weblate 4.15.2\n"
 
 msgctxt "Addon Summary"
 msgid "Backup and restore your Kodi database and configuration files in the event of a crash or file corruption."
@@ -637,11 +637,11 @@ msgstr "Sicherung mit unbekannten Modus gestartet"
 
 msgctxt "#30160"
 msgid "Backup Filename Suffix"
-msgstr "Suffix für Backup-Dateinamen"
+msgstr ""
 
 msgctxt "#30161"
 msgid "Amend a string to the end of each backup folder or ZIP file"
-msgstr "Eine Zeichenfolge ans Ende von jedem Backup-Ordner oder Zip-Datei anhängen"
+msgstr ""
 
 #~ msgctxt "#30036"
 #~ msgid "Custom Directory 1"

resources/language/resource.language.en_gb/strings.po

@@ -294,7 +294,7 @@ msgid "Restart Kodi"
 msgstr ""
 
 msgctxt "#30078"
-msgid "You should restart Kodi to continue"
+msgid "A restart is recommended, select Yes to close Kodi"
 msgstr ""
 
 msgctxt "#30079"

resources/language/resource.language.es_es/strings.po

@@ -18,9 +18,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: XBMC Addons\n"
-"Report-Msgid-Bugs-To: translations@kodi.tv\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2023-04-08 08:16+0000\n"
+"PO-Revision-Date: 2023-02-27 18:15+0000\n"
 "Last-Translator: José Antonio Alvarado <jalvarado0.eses@gmail.com>\n"
 "Language-Team: Spanish (Spain) <https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/es_es/>\n"
 "Language: es_es\n"
@@ -636,11 +636,11 @@ msgstr "Copia de seguridad iniciada en modo desconocido"
 
 msgctxt "#30160"
 msgid "Backup Filename Suffix"
-msgstr "Sufijo archivo de copia de seguridad"
+msgstr ""
 
 msgctxt "#30161"
 msgid "Amend a string to the end of each backup folder or ZIP file"
-msgstr "Modificar una cadena al final de cada carpeta de copia de seguridad o archivo ZIP"
+msgstr ""
 
 #~ msgctxt "#30036"
 #~ msgid "Custom Directory 1"

resources/language/resource.language.et_ee/strings.po

@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: XBMC Addons\n"
-"Report-Msgid-Bugs-To: translations@kodi.tv\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2023-06-16 08:42+0000\n"
+"PO-Revision-Date: 2023-02-27 18:15+0000\n"
 "Last-Translator: rimasx <riks_12@hot.ee>\n"
 "Language-Team: Estonian <https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/et_ee/>\n"
 "Language: et_ee\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.17\n"
+"X-Generator: Weblate 4.15.2\n"
 
 msgctxt "Addon Summary"
 msgid "Backup and restore your Kodi database and configuration files in the event of a crash or file corruption."
@@ -624,8 +624,8 @@ msgstr "Varundamine algas tundmatus režiimis"
 
 msgctxt "#30160"
 msgid "Backup Filename Suffix"
-msgstr "Varukoopia failinime järelliide"
+msgstr ""
 
 msgctxt "#30161"
 msgid "Amend a string to the end of each backup folder or ZIP file"
-msgstr "Muuda iga varukoopia kausta või ZIP-faili lõpu stringi"
+msgstr ""

resources/language/resource.language.fi_fi/strings.po

@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: XBMC Addons\n"
-"Report-Msgid-Bugs-To: translations@kodi.tv\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2023-04-07 02:16+0000\n"
+"PO-Revision-Date: 2022-12-07 19:15+0000\n"
 "Last-Translator: Oskari Lavinto <olavinto@protonmail.com>\n"
 "Language-Team: Finnish <https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/fi_fi/>\n"
 "Language: fi_fi\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.15.2\n"
+"X-Generator: Weblate 4.14.2\n"
 
 msgctxt "Addon Summary"
 msgid "Backup and restore your Kodi database and configuration files in the event of a crash or file corruption."
@@ -625,11 +625,11 @@ msgstr "Varmuuskopiointi käynnistyi tuntemattomassa tilassa"
 
 msgctxt "#30160"
 msgid "Backup Filename Suffix"
-msgstr "Varmuuskopiotiedoston jälkiliite"
+msgstr ""
 
 msgctxt "#30161"
 msgid "Amend a string to the end of each backup folder or ZIP file"
-msgstr "Jokaisen varmuuskopiokansion tai ZIP-tiedoston perään lisättävä merkkijono."
+msgstr ""
 
 #~ msgctxt "#30036"
 #~ msgid "Custom Directory 1"

resources/language/resource.language.it_it/strings.po

@@ -15,9 +15,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: XBMC Addons\n"
-"Report-Msgid-Bugs-To: translations@kodi.tv\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2023-05-12 05:16+0000\n"
+"PO-Revision-Date: 2023-04-02 09:16+0000\n"
 "Last-Translator: Massimo Pissarello <mapi68@gmail.com>\n"
 "Language-Team: Italian <https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/it_it/>\n"
 "Language: it_it\n"
@@ -389,7 +389,7 @@ msgstr "Google Drive"
 
 msgctxt "#30099"
 msgid "Open Settings"
-msgstr "Apri impostazioni"
+msgstr "Apri Impostazioni"
 
 msgctxt "#30100"
 msgid "Extracting Archive"
@@ -633,11 +633,11 @@ msgstr "Backup avviato con modalità sconosciuta"
 
 msgctxt "#30160"
 msgid "Backup Filename Suffix"
-msgstr "Suffisso nome file di backup"
+msgstr ""
 
 msgctxt "#30161"
 msgid "Amend a string to the end of each backup folder or ZIP file"
-msgstr "Modifica una stringa alla fine di ogni cartella di backup o file ZIP"
+msgstr ""
 
 #~ msgctxt "#30036"
 #~ msgid "Custom Directory 1"

resources/language/resource.language.ko_kr/strings.po

@@ -10,9 +10,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: XBMC Addons\n"
-"Report-Msgid-Bugs-To: translations@kodi.tv\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2023-04-13 06:16+0000\n"
+"PO-Revision-Date: 2021-08-26 03:29+0000\n"
 "Last-Translator: Minho Park <parkmino@gmail.com>\n"
 "Language-Team: Korean <https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/ko_kr/>\n"
 "Language: ko_kr\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.15.2\n"
+"X-Generator: Weblate 4.8\n"
 
 msgctxt "Addon Summary"
 msgid "Backup and restore your Kodi database and configuration files in the event of a crash or file corruption."
@@ -628,11 +628,11 @@ msgstr "알 수 없는 모드로 백업이 시작됨"
 
 msgctxt "#30160"
 msgid "Backup Filename Suffix"
-msgstr "파일 이름 끝글자 저장"
+msgstr ""
 
 msgctxt "#30161"
 msgid "Amend a string to the end of each backup folder or ZIP file"
-msgstr "각 백업 폴더 또는 ZIP 파일의 끝글자 수정"
+msgstr ""
 
 #~ msgctxt "#30036"
 #~ msgid "Custom Directory 1"

resources/language/resource.language.pl_pl/strings.po

@@ -15,9 +15,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: XBMC Addons\n"
-"Report-Msgid-Bugs-To: translations@kodi.tv\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2023-04-07 02:16+0000\n"
+"PO-Revision-Date: 2023-02-06 00:15+0000\n"
 "Last-Translator: Marek Adamski <fevbew@wp.pl>\n"
 "Language-Team: Polish <https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/pl_pl/>\n"
 "Language: pl_pl\n"
@@ -633,11 +633,11 @@ msgstr "Tworzenie kopii zapasowej rozpoczęło się w nieznanym trybie"
 
 msgctxt "#30160"
 msgid "Backup Filename Suffix"
-msgstr "Sufiks nazwy pliku kopii zapasowej"
+msgstr ""
 
 msgctxt "#30161"
 msgid "Amend a string to the end of each backup folder or ZIP file"
-msgstr "Popraw ciąg na końcu każdego folderu kopii zapasowej lub pliku ZIP"
+msgstr ""
 
 #~ msgctxt "#30036"
 #~ msgid "Custom Directory 1"

resources/language/resource.language.ru_ru/strings.po

@@ -9,17 +9,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: XBMC Addons\n"
-"Report-Msgid-Bugs-To: translations@kodi.tv\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2023-04-14 16:16+0000\n"
+"PO-Revision-Date: 2022-12-23 12:15+0000\n"
-"Last-Translator: vgbsd <vg72i@protonmail.com>\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
 "Language-Team: Russian <https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/ru_ru/>\n"
 "Language: ru_ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-"X-Generator: Weblate 4.15.2\n"
+"X-Generator: Weblate 4.15\n"
 
 msgctxt "Addon Summary"
 msgid "Backup and restore your Kodi database and configuration files in the event of a crash or file corruption."
@@ -627,7 +627,7 @@ msgstr "Резервное копирование запущено в неизв
 
 msgctxt "#30160"
 msgid "Backup Filename Suffix"
-msgstr "Расширение имени резервного файла"
+msgstr ""
 
 msgctxt "#30161"
 msgid "Amend a string to the end of each backup folder or ZIP file"

resources/language/resource.language.sk_sk/strings.po

@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: XBMC Addons\n"
-"Report-Msgid-Bugs-To: translations@kodi.tv\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2023-10-23 12:11+0000\n"
+"PO-Revision-Date: 2023-03-20 12:16+0000\n"
 "Last-Translator: Christian Gade <gade@kodi.tv>\n"
 "Language-Team: Slovak <https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/sk_sk/>\n"
 "Language: sk_sk\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 5.0.2\n"
+"X-Generator: Weblate 4.15.2\n"
 
 msgctxt "Addon Summary"
 msgid "Backup and restore your Kodi database and configuration files in the event of a crash or file corruption."
@@ -473,7 +473,7 @@ msgstr ""
 
 msgctxt "#30122"
 msgid "Edit"
-msgstr "Upraviť"
+msgstr ""
 
 msgctxt "#30123"
 msgid "Delete"

resources/language/resource.language.zh_cn/strings.po

@@ -11,9 +11,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: XBMC Addons\n"
-"Report-Msgid-Bugs-To: translations@kodi.tv\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2023-05-09 06:24+0000\n"
+"PO-Revision-Date: 2021-10-13 09:30+0000\n"
 "Last-Translator: taxigps <taxigps@sina.com>\n"
 "Language-Team: Chinese (China) <https://kodi.weblate.cloud/projects/kodi-add-ons-scripts/script-xbmcbackup/zh_cn/>\n"
 "Language: zh_cn\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.15.2\n"
+"X-Generator: Weblate 4.8\n"
 
 msgctxt "Addon Summary"
 msgid "Backup and restore your Kodi database and configuration files in the event of a crash or file corruption."
@@ -629,11 +629,11 @@ msgstr "备份以未知模式启动"
 
 msgctxt "#30160"
 msgid "Backup Filename Suffix"
-msgstr "备份文件名后缀"
+msgstr ""
 
 msgctxt "#30161"
 msgid "Amend a string to the end of each backup folder or ZIP file"
-msgstr "将字符串修改到每个备份文件夹或 ZIP 文件的末尾"
+msgstr ""
 
 #~ msgctxt "#30036"
 #~ msgid "Custom Directory 1"

resources/lib/backup.py

@@ -285,7 +285,9 @@ class XbmcBackup:
                     self._createResumeBackupFile()
 
                     # do not continue running
-                    xbmcgui.Dialog().ok(utils.getString(30077), utils.getString(30078))
+                    if(xbmcgui.Dialog().yesno(utils.getString(30077), utils.getString(30078), autoclose=15000)):
+                        xbmc.executebuiltin('Quit')
+
                     return
 
             # check if settings should be restored from this backup
@@ -347,6 +349,11 @@ class XbmcBackup:
             # call update addons to refresh everything
             xbmc.executebuiltin('UpdateLocalAddons')
 
+            # notify user that restart is recommended
+            if(xbmcgui.Dialog().yesno(utils.getString(30077), utils.getString(30078), autoclose=15000)):
+                xbmc.executebuiltin('Quit')
+
+
     def _setupVFS(self, mode=-1, progressOverride=False):
         # set windows setting to true
         window = xbmcgui.Window(10000)
@@ -414,9 +421,9 @@ class XbmcBackup:
                 if(utils.getSettingBool('verbose_logging')):
                     utils.log('Writing file: ' + aFile['file'])
 
-                if(aFile['file'].startswith("-")):
+                if(aFile['is_dir']):
                     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) + 1:])
+                    dest.mkdir(dest.root_path + aFile['file'][len(source.root_path):])
                 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,6 +433,7 @@ 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
@@ -583,7 +591,7 @@ class FileManager:
     def walk(self):
 
         for aDir in self.root_dirs:
-            self.addFile('-' + xbmcvfs.translatePath(aDir['path']))
+            self.addFile(xbmcvfs.translatePath(aDir['path']), True)
             self.walkTree(xbmcvfs.translatePath(aDir['path']), aDir['recurse'])
 
     def walkTree(self, directory, recurse=True):
@@ -605,7 +613,7 @@ class FileManager:
                     # check if directory is excluded
                     if(not any(dirPath.startswith(exDir) for exDir in self.exclude_dir)):
 
-                        self.addFile("-" + dirPath)
+                        self.addFile(dirPath, True)
 
                         # catch for "non directory" type files
                         shouldWalk = True
@@ -628,7 +636,7 @@ class FileManager:
         else:
             self.excludeFile(xbmcvfs.translatePath(dirMeta['path']))
 
-    def addFile(self, filename):
+    def addFile(self, filename, is_dir = False):
         # write the full remote path name of this file
         if(utils.getSettingBool('verbose_logging')):
             utils.log("Add File: " + filename)
@@ -637,7 +645,7 @@ class FileManager:
         fSize = self.vfs.fileSize(filename)
         self.totalSize = self.totalSize + fSize
 
-        self.fileArray.append({'file': filename, 'size': fSize})
+        self.fileArray.append({'file': filename, 'size': fSize, 'is_dir': is_dir})
 
     def excludeFile(self, filename):
         # remove trailing slash