Merge branch 'master' into krypton

.github/stale-dontuse.yml

@@ -0,0 +1,18 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 31
+# Number of days of inactivity before a stale Issue or Pull Request is closed
+daysUntilClose: 14 
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels:
+  - waiting for info
+  - wontfix
+
+# Label to use when marking as stale
+staleLabel: inactive
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as inactive because it has not had
+  recent activity. It will be closed if no further activity occurs.

.travis.yml

@@ -0,0 +1,13 @@
+dist: xenial
+language: python
+python: 3.7
+
+install:
+  - pip install kodi-addon-checker
+
+before_script:
+- git config core.quotepath false
+
+# command to run our tests
+script:
+  - kodi-addon-checker --branch=krypton --allow-folder-id-mismatch

README.md

@@ -1,4 +1,7 @@
 # Backup Addon
+[![Build Status](https://travis-ci.org/robweber/xbmcbackup.svg?branch=master)](https://travis-ci.org/robweber/xbmcbackup)
+
+__Kodi Version Compatibility:__ Kodi 17.x (Krypton) and greater
 
 __Kodi Version Compatibility:__ Kodi 17.x (Krypton) and greater
 

addon.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.xbmcbackup"
-    name="Backup" version="1.5.0~beta3" provider-name="robweber">
+    name="Backup" version="1.5.0" provider-name="robweber">
   <requires>
 	<!-- jarvis -->
     <import addon="xbmc.python" version="2.25.0"/>

changelog.txt

@@ -1,3 +1,7 @@
+Version 1.5.0
+
+Overhaul of file selection and restore procedures. Breaking Change with previous versions PR117
+
 Version 1.1.3
 
 added file chunk support for dropbox uploads

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

@@ -518,7 +518,7 @@ msgid "Choose Sets to Restore"
 msgstr ""
 
 msgctxt "#30132"
-msgid "Version 1.1.4 requires you to setup your file selections again - this is a breaking change"
+msgid "Version 1.5.0 requires you to setup your file selections again - this is a breaking change"
 msgstr ""
 
 msgctxt "#30133"

resources/settings.xml

@@ -4,7 +4,7 @@
 		<setting id="compress_backups" type="bool" label="30087" default="false" />
 		<setting id="backup_rotation" type="number" label="30026" default="0" />
 		<setting id="progress_mode" type="enum" label="30022" lvalues="30082|30083|30084" default="0" />
-		<setting id="upgrade_notes" type="number" label="upgrade_notes" visible="false" default="0" />
+		<setting id="upgrade_notes" type="number" label="upgrade_notes" visible="false" default="1" />
 	</category>
 	<category id="backup_path" label="30048">
 		<setting id="remote_selection" type="enum" lvalues="30018|30019|30027|30098" default="0" label="30025"/>
@@ -14,8 +14,8 @@
 		<setting id="dropbox_secret" type="text" label="30029" visible="eq(-4,2)" default="" />
 		<setting id="google_drive_id" type="text" label="Client ID" visible="eq(-5,3)" default="" />
 		<setting id="google_drive_secret" type="text" label="Client Secret" visible="eq(-6,3)" default="" />
-		<setting id="auth_dropbox_button" type="action" label="30104" action="RunScript(special://home/addons/script.xbmcbackup/launcher.py,action=authorize_cloud&provider=dropbox)" visible="eq(-7,2)"/>
-		<setting id="auth_google_button" type="action" label="30104" action="RunScript(special://home/addons/script.xbmcbackup/launcher.py,action=authorize_cloud&provider=google_drive)" visible="eq(-8,3)"/>
+		<setting id="auth_dropbox_button" type="action" label="30104" action="RunScript(special://home/addons/script.xbmcbackup/launcher.py,action=authorize_cloud,provider=dropbox)" visible="eq(-7,2)"/>
+		<setting id="auth_google_button" type="action" label="30104" action="RunScript(special://home/addons/script.xbmcbackup/launcher.py,action=authorize_cloud,provider=google_drive)" visible="eq(-8,3)"/>
 		<setting id="remove_auth_button" type="action" label="30093" action="RunScript(special://home/addons/script.xbmcbackup/launcher.py,action=remove_auth)" visible="gt(-9,1)"/>
 	</category>
 	<category id="selection" label="30012">

scheduler.py

@@ -7,7 +7,7 @@ import resources.lib.utils as utils
 from resources.lib.croniter import croniter
 from resources.lib.backup import XbmcBackup
 
-UPGRADE_INT = 1  #to keep track of any upgrade notifications
+UPGRADE_INT = 2  #to keep track of any upgrade notifications
 
 class BackupScheduler:
     monitor = None