mirror of
https://github.com/robweber/xbmcbackup.git
synced 2024-11-15 04:45:49 +01:00
Merge branch 'master' into helix_google_drive
Conflicts: addon.xml resources/language/English/strings.xml resources/settings.xml
This commit is contained in:
commit
9d7076da0c
@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
<addon id="script.xbmcbackup"
|
<addon id="script.xbmcbackup"
|
||||||
name="Backup" version="1.0.0" provider-name="robweber">
|
name="Backup" version="1.0.3" provider-name="robweber">
|
||||||
<requires>
|
<requires>
|
||||||
<import addon="xbmc.python" version="2.14.0"/>
|
<import addon="xbmc.python" version="2.19.0"/>
|
||||||
<import addon="script.module.httplib2" version="0.8.0" optional="true"/>
|
<import addon="script.module.httplib2" version="0.8.0" optional="true"/>
|
||||||
<import addon="script.module.oauth2client" version="1.3.2" optional="true"/>
|
<import addon="script.module.oauth2client" version="1.3.2" optional="true"/>
|
||||||
<import addon="script.module.uritemplate" version="0.6" optional="true"/>
|
<import addon="script.module.uritemplate" version="0.6" optional="true"/>
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
Version 1.0.3
|
||||||
|
|
||||||
|
added "delete auth" dialog to delete oauth files in settings
|
||||||
|
|
||||||
|
Version 1.0.2
|
||||||
|
|
||||||
|
updated xbmc.python version to 2.19.0 - should be helix only
|
||||||
|
|
||||||
Version 1.0.0
|
Version 1.0.0
|
||||||
|
|
||||||
rebranded as "Backup"
|
rebranded as "Backup"
|
||||||
|
11
remove_auth.py
Normal file
11
remove_auth.py
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
import xbmc
|
||||||
|
import xbmcgui
|
||||||
|
import xbmcvfs
|
||||||
|
import resources.lib.utils as utils
|
||||||
|
|
||||||
|
#triggered from settings.xml - asks if user wants to delete OAuth token information
|
||||||
|
shouldDelete = xbmcgui.Dialog().yesno(utils.getString(30093),utils.getString(30094),utils.getString(30095),autoclose=7000)
|
||||||
|
|
||||||
|
if(shouldDelete):
|
||||||
|
#delete any of the known token file types
|
||||||
|
xbmcvfs.delete(xbmc.translatePath(utils.data_dir() + "tokens.txt")) #dropbox
|
@ -84,5 +84,8 @@
|
|||||||
<string id="30090">The destination may not be writeable</string>
|
<string id="30090">The destination may not be writeable</string>
|
||||||
<string id="30091">Zip archive could not be copied</string>
|
<string id="30091">Zip archive could not be copied</string>
|
||||||
<string id="30092">Not all files were copied</string>
|
<string id="30092">Not all files were copied</string>
|
||||||
<string id="30093">Google Drive</string>
|
<string id="30093">Delete Authorization Info</string>
|
||||||
|
<string id="30094">This will delete any OAuth token files</string>
|
||||||
|
<string id="30095">Do you want to do this?</string>
|
||||||
|
<string id="30096">Google Drive</string>
|
||||||
</strings>
|
</strings>
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
<setting id="dropbox_secret" type="text" label="30029" visible="eq(-4,2)" default="" />
|
<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_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="google_drive_secret" type="text" label="Client Secret" visible="eq(-6,3)" default="" />
|
||||||
|
<setting id="remove_auth_button" type="action" label="30096" action="RunScript(special://home/addons/script.xbmcbackup/remove_auth.py)" visible="gt(-7,1)"/>
|
||||||
<setting id="compress_backups" type="bool" label="30087" default="false" />
|
<setting id="compress_backups" type="bool" label="30087" default="false" />
|
||||||
<setting id="backup_rotation" type="number" label="30026" default="0" />
|
<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="progress_mode" type="enum" label="30022" lvalues="30082|30083|30084" default="0" />
|
||||||
|
Loading…
Reference in New Issue
Block a user