[Xbmc-addons] Scripts branch, frodo, updated. c5d09c5b06d9a8f4b04eea94e5a61e752d7cedc6

Tue, 01 Apr 2014 01:56:33 -0700 

The branch, frodo has been updated
       via  c5d09c5b06d9a8f4b04eea94e5a61e752d7cedc6 (commit)
       via  b4b257e4b1a975d5581443a19948659d83b37a45 (commit)
      from  c69bc7dc95c621da7b14a4d6d856d76d7e6d46f4 (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=c5d09c5b06d9a8f4b04eea94e5a61e752d7cedc6

commit c5d09c5b06d9a8f4b04eea94e5a61e752d7cedc6
Author: Martijn Kaijser <[email protected]>
Date:   Tue Apr 1 10:54:36 2014 +0200

    [service.libraryautoupdate] 0.8.5

diff --git a/service.libraryautoupdate/addon.xml 
b/service.libraryautoupdate/addon.xml
index 2d8af50..16db63f 100644
--- a/service.libraryautoupdate/addon.xml
+++ b/service.libraryautoupdate/addon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="service.libraryautoupdate"
-    name="XBMC Library Auto Update" version="0.8.0" provider-name="robweber">
+    name="XBMC Library Auto Update" version="0.8.5" provider-name="robweber">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
   </requires>
@@ -11,6 +11,7 @@
   </extension>
   <extension point="xbmc.addon.metadata">
     <summary lang="be">Update your XBMC Video and Music Libraries on a timer. 
Timer runs as an XBMC service so you never miss an update.</summary>
+    <summary lang="bg">Обновява библиотеките в XBMC (за 
видео и музика) чрез брояч. Той се стартира 
като XBMC услуга, затова никога няма да 
изпуснете нито едно обновяване.</summary>
     <summary lang="da">Opdater dine XBMC video- og musikbiblioteker ved hjælp 
af en timer. Timeren kører som en XBMC service, så du aldrig glipper en 
opdatering</summary>
     <summary lang="de">Update deine XBMC Video- und Musiklibrariers mit einem 
Timer. Der Timer läuft als ein XBMC service, sodass Du niemals ein Update 
verpasst.</summary>
     <summary lang="el">Ενημερώστε τις συλλογές 
ταινιών και μουσικής σας με χρονοδιακόπτη. 
Ο χρονοδιακόπτης εκτελείται σαν υπηρεσία 
του XBMC ούτως ώστε να μη χάνετε ποτέ καμία 
ενημέρωση.</summary>
@@ -32,6 +33,7 @@
     <summary lang="sv">Uppdatera ditt XBMC video och musikbibliotek 
schemalagt. Schemaläggaren körs som en XBMC-service så du aldrig missar en 
uppdatering.</summary>
     <summary lang="zh">定时更新你
的XBMC视频和音乐资料库。定时器以XBMC服务的方式运行以保证不会错过更新。</summary>
     <description lang="be">This is an XBMC Service that will update your music 
and video libraries on a timer. You can select a different interval to scan 
your media databases (Audio,Video,Both) or you can set a cron-style timer for 
greater control. If you are playing an audio or video file when the timer 
starts it can skip the library update process until it is completed so that 
you're media experience is not interrupted. Updating a specific Video Path, and 
Cleaning the Music/Video libraries is now supported.</description>
+    <description lang="bg">Услугата ще обновява видео 
и музикалната библиотека в XBMC през 
определен интервал от време. Можете да 
променяте интервала за сканиране (на 
източниците на видео, аудио или и за двата 
вида информация). Можете да зададете брояч 
в стил cron (за запознатите с Linux), който Ви 
осигурява по-голям контрол. Ако се случи, че 
гледате/слушате файл от библиотека за 
която се е задействал брояч сканирането ще 
се отложи до момента в който не приключите 
активността. Също така се поддържа и 
обновяване на определени папки и 
почистване на библиотеките.</d
 escription>
     <description lang="da">Dette er en XBMC service, der opdaterer dine musik- 
og videobiblioteker ved hjælp af en timer. Du kan vælge forskellige 
intervaller for skanningen af din mediedatabase (lyd, video, begge) eller du 
kan vælge en cron-baseret timer for øget kontrol. Hvis du afspiller en lyd- 
eller videofil, når timeren begynder, kan den springe over opdatering af 
biblioteket indtil emnet er færdigafspillet, så din medieoplevelse ikke 
afbrydes. Opdatering af specifikke videostier og oprydning i 
musik/videobibliotekerne er nu understøttet.</description>
     <description lang="de">Dies ist ein XBMC Service, der deine Musik und 
Video Bibliothek in bestimmten Abständen automatisch aktualisiert. Du kannst 
verschiedene Intervalle für das Scannen deiner Mediendatenbanken (Audio, Video 
oder beides) verwenden oder einen eigenen Cron Ausdruck für noch mehr 
Kontrolle benutzen. Wenn du gerade Musik oder ein Video abspielst kannst du den 
Timer des automatischen Updates überspringen, so dass dein Film Erlebnis nicht 
unterbrochen wird. Die Aktualisierung von konkreten Pfaden und Aufräumen der 
Musik/Video Bibliotheken wird nun unterstützt</description>
     <description lang="el">Αυτή είναι μία Υπηρεσία του 
XBMC που ενημερώνει τις συλλογές ταινιών και 
μουσικής σας με χρονοδιακόπτη. Μπορείτε να 
επιλέξετε διαφορετικό χρονικό διάστημα 
για σάρωση των πολυμέσων σας (Μουσική, 
Βίντεο, Και Τα Δυο) ή μπορείτε να ορίσετε 
ένα χρονοδιακόπτη τύπου cron για καλύτερο 
έλεγχο. Αν αναπαράγεται μία ταινία ή ένα 
τραγούδι όταν αρχίσει ο χρονοδιακόπτης 
μπορεί να αναβληθεί η διαδικασία της 
ενημέρωσης της συλλογής μέχρις ότου 
τελειώσει, προκειμένου να μην επηρεαστεί η 
αναπαραγωγή. Πλέον υποστηρίζεται η 
ενημέρωση συγκεκριμένη
 ς Διαδρομής Βίντεο, καθώς και Εκκαθάριση 
των συλλογών Ταινιών/Μουσικής.</description>
@@ -54,6 +56,7 @@
     <description lang="zh">这是一个定时更新你
的音乐和视频资料库的XBMC服务程序。你
可以设置不同的时间间隔来扫描媒体库（音频、视频或二者
），或者
设置一个cron类型的定时器来获得更好的控制。如果定时动作开始时ä½
 
正在播放一个音频或视频文件，它会跳过此次更新直到播放完毕以避å
…å½±å“ä½ æ¬£èµåª’体。现在已支持更新指定的视频路径以及清
理音视频资料库。</description>
     <forum>http://forum.xbmc.org/showthread.php?tid=119520</forum>
     <source>https://github.com/robweber/xbmclibraryautoupdate</source>
+    <license>The MIT License</license>
     <language></language>
   </extension>
 </addon>
diff --git a/service.libraryautoupdate/changelog.txt 
b/service.libraryautoupdate/changelog.txt
index 66bfc18..a3f80b4 100644
--- a/service.libraryautoupdate/changelog.txt
+++ b/service.libraryautoupdate/changelog.txt
@@ -1,3 +1,23 @@
+Version 0.8.5
+
+version bump for translation updates
+
+Version 0.8.4
+
+Fix for a very odd timing bug causing multiple scans - thanks tknorris
+
+Version 0.8.3
+
+separated notifications and setting strings for translators - thanks NEOhidra
+
+Version 0.8.2
+
+added version info to logs
+
+Version 0.8.1
+
+added license tag
+
 Version 0.8.0
 
 clean up monitor on exit
diff --git a/service.libraryautoupdate/resources/language/Bulgarian/strings.xml 
b/service.libraryautoupdate/resources/language/Bulgarian/strings.xml
index a8e209c..6704136 100644
--- a/service.libraryautoupdate/resources/language/Bulgarian/strings.xml
+++ b/service.libraryautoupdate/resources/language/Bulgarian/strings.xml
@@ -4,7 +4,54 @@
 <!-- Report language file syntax bugs at: [email protected] -->
 
 <strings>
-    <string id="30001">General</string>
-    <string id="30002">видео</string>
+    <string id="30000">Автоматично обновяване</string>
+    <string id="30001">Основни</string>
+    <string id="30002">Видео</string>
     <string id="30003">Музика</string>
+    <string id="30004">Обновявай видео 
библиотеката</string>
+    <string id="30005">Обновявай музикалната 
библиотека</string>
+    <string id="30006">Показвай известия</string>
+    <string id="30007">Обновяване и по време на 
възпроизвеждане</string>
+    <string id="30008">Забави обновяването, след 
зареждането на XBMC, с (минути)</string>
+    <string id="30009">Брояч с допълнителни 
опции</string>
+    <string id="30010">Интервал между две 
обновявания (часове)</string>
+    <string id="30011">Cron израз</string>
+    <string id="30012">на видео библиотеката</string>
+    <string id="30013">на музикалната 
библиотека</string>
+
+    <!-- specific paths -->
+    <string id="30020">Обновяване на път №1</string>
+    <string id="30021">Обновяване на път №2</string>
+    <string id="30022">Обновяване на път №3</string>
+    <string id="30023">Път до видео файловете</string>
+
+    <!-- disclaimer -->
+    <string id="30030">Прочетете опровержението</string>
+    <string id="30031">Опровержение за пътя до видео 
файловете</string>
+    <string id="30032">Пътят трябва да е съществуващ 
видео източник със съдържание.</string>
+    <string id="30033">Пътят да е идентичен с пътя на 
източника.</string>
+
+    <!-- cleaning -->
+    <string id="30040">Почистване</string>
+    <string id="30041">Почистване на 
библиотеките</string>
+    <string id="30042">Потвърждаване на източника 
преди почистване</string>
+    <string id="30043">Честота</string>
+    <string id="30044">След обновяване</string>
+    <string id="30045">Веднъж на ден</string>
+    <string id="30046">Веднъж на седмица</string>
+    <string id="30047">Веднъж на месец</string>
+    <string id="30048">Почиствай видео 
библиотеката</string>
+    <string id="30049">Почиствай музикалната 
библиотека</string>
+    <string id="30050">Възникна грешка при 
почистването на базата от данни</string>
+    <string id="30051">Запитване на потребителя 
преди почистването</string>
+    <string id="30052">Следващото почистване ще 
стартира след </string>
+    <string id="30053">Желаете ли да стартирате 
ръчно почистването, сега?</string>
+    <string id="30054">Библиотека за почистване</string>
+    <string id="30055">И двете</string>
+    <string id="30056">Cron израз за видео</string>
+    <string id="30057">Cron израз за музика</string>
+
+    <!-- manual run -->
+    <string id="30060">Следващото обновяване ще 
стартира след </string>
+    <string id="30061">Желаете ли да стартирате 
ръчно обновяването, сега?</string>
 </strings>
diff --git a/service.libraryautoupdate/resources/language/English/strings.xml 
b/service.libraryautoupdate/resources/language/English/strings.xml
index 521fc9a..72b6371 100644
--- a/service.libraryautoupdate/resources/language/English/strings.xml
+++ b/service.libraryautoupdate/resources/language/English/strings.xml
@@ -16,7 +16,9 @@
     <string id="30009">Used Advanced Timer</string>
     <string id="30010">Amount of time between updates (hours)</string>
     <string id="30011">Cron Expression</string>
-
+       <string id="30012">Update Video Library</string>
+       <string id="30013">Update Music Library</string>
+       
     <!-- specific paths -->
     <string id="30020">Update Specific Path 1</string>
     <string id="30021">Update Specific Path 2</string>
diff --git a/service.libraryautoupdate/resources/lib/utils.py 
b/service.libraryautoupdate/resources/lib/utils.py
index 833c844..b5deb65 100644
--- a/service.libraryautoupdate/resources/lib/utils.py
+++ b/service.libraryautoupdate/resources/lib/utils.py
@@ -11,7 +11,7 @@ def addon_dir():
     return __Addon.getAddonInfo('path')
 
 def log(message,loglevel=xbmc.LOGNOTICE):
-    xbmc.log(encode(__addon_id__ + ": " + message),level=loglevel)
+    xbmc.log(encode(__addon_id__ + "-" + __Addon.getAddonInfo('version') + " : 
" + message),level=loglevel)
 
 def showNotification(title,message):
     xbmc.executebuiltin("Notification(" + encode(title) + "," + 
encode(message) + ",4000," + xbmc.translatePath(__Addon.getAddonInfo('path') + 
"/resources/images/clock.png") + ")")
diff --git a/service.libraryautoupdate/service.py 
b/service.libraryautoupdate/service.py
index 7e57096..1eb3776 100644
--- a/service.libraryautoupdate/service.py
+++ b/service.libraryautoupdate/service.py
@@ -91,6 +91,10 @@ class AutoUpdater:
                                 #find the next run time
                                 cronJob.next_run = 
self.calcNextRun(cronJob.expression,now)
                                 self.schedules[count] = cronJob
+                                
+                            elif(self.scanRunning() == True):
+                                self.schedules[count].on_delay = True
+                                utils.log("Waiting for other scan to finish")
                         else:
                             utils.log("Network down, not running")
                     else:
@@ -100,7 +104,8 @@ class AutoUpdater:
                 count = count + 1
 
             #write last run time
-            self.last_run = time.time() - (time.time() % 60)
+            now = time.time()
+            self.last_run = now - (now % 60)
         
     def createSchedules(self,forceUpdate = False):
         utils.log("update timers")
@@ -141,9 +146,10 @@ class AutoUpdater:
                                                                                
 
 
         if(utils.getSetting('update_video') == 'true'):
+            utils.log("Creating timer for Video Library");
             #create the video schedule
             aSchedule = CronSchedule()
-            aSchedule.name = utils.getString(30004)
+            aSchedule.name = utils.getString(30012)
             aSchedule.command = 'UpdateLibrary(video)'
             aSchedule.expression = self.checkTimer('video')
             aSchedule.next_run = 
self.calcNextRun(aSchedule.expression,self.last_run)
@@ -151,9 +157,10 @@ class AutoUpdater:
             self.schedules.append(aSchedule)
 
         if(utils.getSetting('update_music') == 'true'):
+            utils.log("Creating timer for Music Library");
             #create the music schedule
             aSchedule = CronSchedule()
-            aSchedule.name = utils.getString(30005)
+            aSchedule.name = utils.getString(30013)
             aSchedule.command = 'UpdateLibrary(music)'
             aSchedule.expression = self.checkTimer('music')
             aSchedule.next_run = 
self.calcNextRun(aSchedule.expression,self.last_run)
@@ -161,6 +168,7 @@ class AutoUpdater:
             self.schedules.append(aSchedule)
 
         if(utils.getSetting('use_custom_1_path') == 'true'):
+            utils.log("Creating timer for Custom Path 1");
             #create a custom video path schedule
             aSchedule = CronSchedule()
             aSchedule.name = utils.getString(30020)
@@ -171,6 +179,7 @@ class AutoUpdater:
             self.schedules.append(aSchedule)
 
         if(utils.getSetting('use_custom_2_path') == 'true'):
+            utils.log("Creating timer for Custom Path 2");
             #create a custom video path schedule
             aSchedule = CronSchedule()
             aSchedule.name = utils.getString(30021)
@@ -181,6 +190,7 @@ class AutoUpdater:
             self.schedules.append(aSchedule)
 
         if(utils.getSetting('use_custom_3_path') == 'true'):
+            utils.log("Creating timer for Custom Path 3");
             #create a custom video path schedule
             aSchedule = CronSchedule()
             aSchedule.name = utils.getString(30022)

http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=b4b257e4b1a975d5581443a19948659d83b37a45

commit b4b257e4b1a975d5581443a19948659d83b37a45
Author: Martijn Kaijser <[email protected]>
Date:   Tue Apr 1 10:53:30 2014 +0200

    [script.xbmcbackup] 0.4.7

diff --git a/script.xbmcbackup/addon.xml b/script.xbmcbackup/addon.xml
index da1695d..1bac4e9 100644
--- a/script.xbmcbackup/addon.xml
+++ b/script.xbmcbackup/addon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.xbmcbackup"
-    name="XBMC Backup" version="0.4.5" provider-name="robweber">
+    name="XBMC Backup" version="0.4.7" provider-name="robweber">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
   </requires>
@@ -11,6 +11,7 @@
   <extension point="xbmc.addon.metadata">
     <summary lang="ar">قم بنسخ احتياطي و استعد قاعدة 
بيانات XBMC الخاص بك و ملفات التكوين في حال 
وقوع حادث أو تلف الملفات.</summary>
     <summary lang="be">Backup and restore your XBMC database and configuration 
files in the event of a crash or file corruption.</summary>
+    <summary lang="bg">Добавката може да създава 
резервно копие на XBMC и възстановява (след 
това) Вашата база от данни и настройки, в 
случай на необходимост.</summary>
     <summary lang="ca">Copiau i restaurau la vostra base de dades d'XBMC i els 
fitxers de configuració en cas de caiguda o corrupció de fitxers.</summary>
     <summary lang="da">Sikkerhedskopiér og genskab din XBMC database og 
konfigurationsfiler i tilfælde af et nedbrud eller en ødelagt fil.</summary>
     <summary lang="de">Die XBMC Datenbank sichern und bei Dateiverlust oder 
Beschädigung wiederherstellen.</summary>
@@ -36,6 +37,7 @@
     <summary lang="sv">Ta backupp av eller återställ din XBMC-databas och 
konfigurationsfiler i händelse av en krash eller filkorruption.</summary>
     <summary lang="zh">备份和恢复XBMC数据库和é…
ç½®æ–‡ä»¶ï¼Œä»¥é˜²èŒƒç³»ç»Ÿå´©æºƒæˆ–文件损坏问题。</summary>
     <description lang="be">Ever hosed your XBMC configuration and wished you'd 
had a backup? Now you can with one easy click. You can export your database, 
playlist, thumbnails, addons and other configuration details to any source 
writeable by XBMC or directly to Dropbox cloud storage. Backups can be run on 
demand or via a scheduler. </description>
+    <description lang="bg">Някога да сте губили всички 
настройки, които сте правили по XBMC? А 
разполагахте ли с резервно копие? Е сега 
можете да създавате резервни копия само с 
едно кликване. Можете да изнасяте базата от 
данни, плейлистите, миниатюрите, добавките 
и други, на всяко място до което XBMC има 
права за писане или директно в Dropbox. Можете 
да настроите и автоматично създаване на 
копия през определен интервал от 
време.</description>
     <description lang="ca">Sempre canvia la configuració XBMC i ha desitjat 
tinir una còpia de seguretat? Ara pot fer-ho amb un simple clic. Podeu 
exportar la seva base de dades, llista de reproducció, miniatures, complements 
i altres detalls de la configuració per a qualsevol complement de XBMC o 
directament emmagatzemar-ho al Dropbox  en el núvol. Les còpies de seguretat 
es poden executar a la demanda o per mitjà d'un planificador.</description>
     <description lang="da">Har du prøvet at slette din XBMC opsætning, og 
ønsket at du havde haft sikkerhedskopi? Nu kan du få det med et enkelt klik. 
Du kan eksportere din database, afspilninglister, miniaturebilleder, addons og 
andre opsætningsdetaljer til enhver kilde, som er skrivbar for XBMC eller 
direkt til Dropbox cloud lager. Sikkerhedskopier kan køres manuelt eller via 
en tidsplan.</description>
     <description lang="de">Jemals deine XBMC Konfiguration zerschossen und dir 
dann gewünscht, dass ein Backup existiert? Jetzt kannst du eine Sicherung mit 
nur einem Klick erzeugen. Du kannst deine Datenbanen, Playlisten, Thumbnails, 
Addons und andere Details zu einem Ort deiner Wahl sichern.</description>
diff --git a/script.xbmcbackup/changelog.txt b/script.xbmcbackup/changelog.txt
index 3becb42..9b2e7dd 100644
--- a/script.xbmcbackup/changelog.txt
+++ b/script.xbmcbackup/changelog.txt
@@ -1,3 +1,11 @@
+Version 0.4.7
+
+fixed critical error in backup rotation
+
+Version 0.4.6
+
+modified backup folder names to include time, also modified display listing
+
 Version 0.4.5
 
 added version info to logs
diff --git a/script.xbmcbackup/default.py b/script.xbmcbackup/default.py
index 723559e..b2bd2ad 100644
--- a/script.xbmcbackup/default.py
+++ b/script.xbmcbackup/default.py
@@ -25,11 +25,15 @@ if(mode != -1):
         if(mode == backup.Restore):
             #allow user to select the backup to restore from
             restorePoints = backup.listBackups()
+            pointNames = []
 
-            selectedRestore = xbmcgui.Dialog().select(utils.getString(30010) + 
" - " + utils.getString(30021),restorePoints)
+            for aDir in restorePoints:
+                pointNames.append(aDir[1])
+                
+            selectedRestore = xbmcgui.Dialog().select(utils.getString(30010) + 
" - " + utils.getString(30021),pointNames)
 
             if(selectedRestore != -1):
-                backup.selectRestore(restorePoints[selectedRestore])
+                backup.selectRestore(restorePoints[selectedRestore][0])
                     
         backup.run(mode)
     else:
diff --git a/script.xbmcbackup/resources/language/Bulgarian/strings.xml 
b/script.xbmcbackup/resources/language/Bulgarian/strings.xml
index fd27425..9c860bd 100644
--- a/script.xbmcbackup/resources/language/Bulgarian/strings.xml
+++ b/script.xbmcbackup/resources/language/Bulgarian/strings.xml
@@ -4,10 +4,58 @@
 <!-- Report language file syntax bugs at: [email protected] -->
 
 <strings>
-    <string id="30011">General</string>
+    <string id="30010">XBMC Backup</string>
+    <string id="30011">Основи</string>
+    <string id="30012">Избор на файлове</string>
+    <string id="30013">Планиране</string>
+    <string id="30016">Резервно копие</string>
+    <string id="30017">Възстанови</string>
+    <string id="30018">Преглеждане за път</string>
+    <string id="30019">Въвеждане на път</string>
+    <string id="30020">Прегледайте</string>
+    <string id="30021">Име на папката за резервните 
копия</string>
+    <string id="30022">Изпълнявай "тихо"</string>
     <string id="30023">Режим</string>
-    <string id="30032">База от данни</string>
-    <string id="30033">Плейлист</string>
+    <string id="30024">Въведете отдалечения път</string>
+    <string id="30025">Окажете пътя до папката с 
резервни копия</string>
+    <string id="30026">Колко резервни копия да бъдат 
съхранявани (0 за всички)</string>
+    <string id="30027">Dropbox</string>
+    <string id="30028">Dropbox ключ</string>
+    <string id="30029">Dropbox секретен ключ</string>
+    <string id="30030">Добавки</string>
+    <string id="30031">Данните на добавките</string>
+    <string id="30032">Базата данни</string>
+    <string id="30033">Плейлисти</string>
+    <string id="30034">Миниатюри/Фанарт</string>
+    <string id="30035">Файловете с настройки</string>
+    <string id="30036">Персонална директория №1</string>
+    <string id="30037">Персонална директория №2</string>
+    <string id="30038">Засечени са допълнителни 
настройки</string>
+    <string id="30039">Необходимо е първо 
възстановяване на файла "advancedsettings.xml"</string>
+    <string id="30040">Изберете "Да" за 
възстановяване от файла и рестартиране на 
XBMC</string>
+    <string id="30041">Изберете "Не" за да 
продължите</string>
+    <string id="30042">Възобнови</string>
+    <string id="30043">XBMC Backup засече незавършено 
възстановяване</string>
+    <string id="30044">Искате ли да продължите?</string>
+    <string id="30045">Грешка: Отдалеченият път не 
съществува</string>
+    <string id="30046">Стартиране</string>
+    <string id="30047">Локална папка</string>
+    <string id="30048">Отдалечена папка</string>
+    <string id="30049">Изграждане на списък с 
файлове</string>
+    <string id="30050">Отдалеченият път съществува. 
Вероятно съдържа стари файлове!</string>
+    <string id="30051">Създаване на списъка с 
файлове</string>
+    <string id="30052">Записване на файла</string>
+    <string id="30053">Създаване на резервно копие 
(по план)</string>
+    <string id="30054">Премахване на резервно 
копие</string>
+    <string id="30056">За оторизационния URL адрес за 
Dropbox проверете дневника</string>
+    <string id="30057">След оторизирането натиснете 
"Добре"</string>
+    <string id="30058">Необходим е код за 
разработчик за Dropbox</string>
+    <string id="30059">Посетете 
https://www.dropbox.com/developers</string>
+    <string id="30060">Активирай планировчика</string>
+    <string id="30061">Планиране</string>
+    <string id="30062">Час</string>
+    <string id="30063">Ден</string>
+    <string id="30064">Cron планиране</string>
     <string id="30065">неделя</string>
     <string id="30066">понеделник</string>
     <string id="30067">вторник</string>
@@ -15,4 +63,14 @@
     <string id="30069">четвъртък</string>
     <string id="30070">петък</string>
     <string id="30071">събота</string>
+    <string id="30072">Всеки ден</string>
+    <string id="30073">Всяка седмица</string>
+    <string id="30074">Първия ден на месеца</string>
+    <string id="30075">Персонално планиране</string>
+    <string id="30076">Изключвай XBMC след създаването 
на резервно копиране</string>
+    <string id="30077">Рестартиране на XBMC</string>
+    <string id="30078">Необходимо е да рестартирате 
XBMC за да продължите</string>
+       <string id="30079">Само днес</string>
+       <string id="30080">Профили</string>
+       <string id="30081">Планировчика ще стартира 
отново на</string>
 </strings>
diff --git a/script.xbmcbackup/resources/lib/backup.py 
b/script.xbmcbackup/resources/lib/backup.py
index 1e3d45e..ea2d90d 100644
--- a/script.xbmcbackup/resources/lib/backup.py
+++ b/script.xbmcbackup/resources/lib/backup.py
@@ -6,6 +6,15 @@ import os.path
 import time
 from vfs import XBMCFileSystem,DropboxFileSystem
 
+def folderSort(aKey):
+    result = aKey[0]
+    
+    if(len(result) < 8):
+        result = result + "0000"
+
+    return result
+    
+
 class XbmcBackup:
     #constants for initiating a back or restore
     Backup = 0
@@ -60,8 +69,18 @@ class XbmcBackup:
         
         for aDir in dirs:
             if(self.remote_vfs.exists(self.remote_base_path + aDir + 
"/xbmcbackup.val")):
-                result.append(aDir)
 
+                #folder may or may not contain time, older versions didn't 
include this
+                folderName = ''
+                if(len(aDir) > 8):
+                    folderName = aDir[6:8] + '-' + aDir[4:6] + '-' + aDir[0:4] 
+ " " + aDir[8:10] + ":" + aDir[10:12]
+                else:
+                    folderName = aDir[6:8] + '-' + aDir[4:6] + '-' + aDir[0:4]
+
+                result.append((aDir,folderName))
+
+        result.sort(key=folderSort)
+        
         return result
 
     def selectRestore(self,restore_point):
@@ -74,7 +93,7 @@ class XbmcBackup:
         #append backup folder name
         progressBarTitle = utils.getString(30010) + " - "
         if(mode == self.Backup and self.remote_vfs.root_path != ''):
-            self.remote_vfs.set_root(self.remote_vfs.root_path + 
time.strftime("%Y%m%d") + "/")
+            self.remote_vfs.set_root(self.remote_vfs.root_path + 
time.strftime("%Y%m%d%H%M") + "/")
             progressBarTitle = progressBarTitle + utils.getString(30016)
        elif(mode == self.Restore and self.restore_point != None and 
self.remote_vfs.root_path != ''):
            self.remote_vfs.set_root(self.remote_vfs.root_path + 
self.restore_point + "/")
@@ -355,16 +374,15 @@ class XbmcBackup:
 
             if(len(dirs) > total_backups):
                 #remove backups to equal total wanted
-                dirs.sort()
-                remove_num = len(dirs) - total_backups - 1
+                remove_num = 0
                 self.filesTotal = self.filesTotal + remove_num + 1
 
                 #update the progress bar if it is available
-                while(remove_num >= 0 and not self._checkCancel()):
-                    self._updateProgress(utils.getString(30054) + " " + 
dirs[remove_num])
-                    utils.log("Removing backup " + dirs[remove_num])
-                    self.remote_vfs.rmdir(self.remote_base_path + 
dirs[remove_num] + "/")
-                    remove_num = remove_num - 1
+                while(remove_num < (len(dirs) - total_backups) and not 
self._checkCancel()):
+                    self._updateProgress(utils.getString(30054) + " " + 
dirs[remove_num][1])
+                    utils.log("Removing backup " + dirs[remove_num][0])
+                    self.remote_vfs.rmdir(self.remote_base_path + 
dirs[remove_num][0] + "/")
+                    remove_num = remove_num + 1
 
     def _createValidationFile(self):
         vFile = xbmcvfs.File(xbmc.translatePath(utils.data_dir() + 
"xbmcbackup.val"),'w')

-----------------------------------------------------------------------

Summary of changes:
 script.xbmcbackup/addon.xml                        |    4 +-
 script.xbmcbackup/changelog.txt                    |    8 +++
 script.xbmcbackup/default.py                       |    8 ++-
 .../resources/language/Bulgarian/strings.xml       |   64 +++++++++++++++++++-
 script.xbmcbackup/resources/lib/backup.py          |   36 ++++++++---
 service.libraryautoupdate/addon.xml                |    5 +-
 service.libraryautoupdate/changelog.txt            |   20 ++++++
 .../resources/language/Bulgarian/strings.xml       |   51 +++++++++++++++-
 .../resources/language/English/strings.xml         |    4 +-
 service.libraryautoupdate/resources/lib/utils.py   |    2 +-
 service.libraryautoupdate/service.py               |   16 ++++-
 11 files changed, 195 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
Scripts


------------------------------------------------------------------------------

_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to