The branch, eden has been updated
via e943980738a9e02fd7d6d20b189e58d1d87a4ef2 (commit)
via 55f34878463405f60347c3cf1f17098345367856 (commit)
from 5cbf4fdd48c391c38d8da66c0751cc0954e6ae7c (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=e943980738a9e02fd7d6d20b189e58d1d87a4ef2
commit e943980738a9e02fd7d6d20b189e58d1d87a4ef2
Author: amet <[email protected]>
Date: Thu Apr 26 14:23:02 2012 +0400
[script.njoy] -v 0.2.0
- increase zapping speed to 500 miliseconds
diff --git a/script.njoy/addon.xml b/script.njoy/addon.xml
index bbdfb6d..17e4a69 100644
--- a/script.njoy/addon.xml
+++ b/script.njoy/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.njoy"
name="Njoy Live TV"
- version="0.1.2"
+ version="0.2.0"
provider-name="amet">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/script.njoy/changelog.txt b/script.njoy/changelog.txt
index 1e5d1b4..e617170 100644
--- a/script.njoy/changelog.txt
+++ b/script.njoy/changelog.txt
@@ -1,3 +1,6 @@
+0.2.0
+- increase zapping speed to 500 miliseconds
+
0.1.2
- show under Video add-ons rather than programs
diff --git a/script.njoy/resources/lib/gui.py b/script.njoy/resources/lib/gui.py
index cedccfc..eb9e001 100644
--- a/script.njoy/resources/lib/gui.py
+++ b/script.njoy/resources/lib/gui.py
@@ -106,7 +106,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
self.getControl( 206 ).setLabel( self.current_label )
if xbmc.Player().isPlaying():
xbmc.Player().stop()
- xbmc.sleep(3000)
+ xbmc.sleep(500)
xbmc.Player(xbmc.PLAYER_CORE_DVDPLAYER).play(url, 0, 1)
self.getControl(150).setVisible(False)
self.channel = pos
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=55f34878463405f60347c3cf1f17098345367856
commit 55f34878463405f60347c3cf1f17098345367856
Author: amet <[email protected]>
Date: Thu Apr 26 14:22:09 2012 +0400
[script.xbmcbackup] - v0.0.5
[b]Version 0.0.5[/b]
Added option to manually type a path rather than browse for one (only one
used)
Show progress bar right away so you know this is doing something
diff --git a/script.xbmcbackup/README.txt b/script.xbmcbackup/README.txt
index 11a2c08..637308b 100644
--- a/script.xbmcbackup/README.txt
+++ b/script.xbmcbackup/README.txt
@@ -5,7 +5,7 @@ I've had to recover my database, thumbnails, and source
configuration enough tim
Usage:
-In the addon settings you can define a remote path for the destination of your
xbmc files. You must also include a backup folder name, all of your files will
be in this folder once the backup runs.
+In the addon settings you can define a remote path for the destination of your
xbmc files. You must also include a backup folder name, all of your files will
be in this folder once the backup runs. Please note that the typed path will
supercede the browsed path - only one will be used.
On the Backup Selection page you can select which items from your user profile
folder will be sent to the backup location. By default all are turned on except
the Addon Data directory.
diff --git a/script.xbmcbackup/addon.xml b/script.xbmcbackup/addon.xml
index b8f658e..311c711 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.0.4" provider-name="robweber">
+ name="XBMC Backup" version="0.0.5" provider-name="robweber">
<requires>
<import addon="xbmc.python" version="2.0"/>
</requires>
@@ -8,7 +8,7 @@
<provides>executable</provides>
</extension>
<extension point="xbmc.addon.metadata">
- <summary lang="en">Backup abd restore your XBMC database and configuration
files in the event of a crash or file corruption.</summary>
+ <summary lang="en">Backup and restore your XBMC database and configuration
files in the event of a crash or file corruption.</summary>
<description lang="en">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.</description>
<platform>all</platform>
</extension>
diff --git a/script.xbmcbackup/changelog.txt b/script.xbmcbackup/changelog.txt
index 40e26ba..7a038f0 100644
--- a/script.xbmcbackup/changelog.txt
+++ b/script.xbmcbackup/changelog.txt
@@ -9,3 +9,8 @@ Added progress bar and "silent" option for running on startup
or as a script
[b]Version 0.0.4[/b]
Finished code for restore mode.
+
+[b]Version 0.0.5[/b]
+
+Added option to manually type a path rather than browse for one (only one used)
+Show progress bar right away so you know this is doing something
diff --git a/script.xbmcbackup/default.py b/script.xbmcbackup/default.py
index 690858b..7d8d09b 100644
--- a/script.xbmcbackup/default.py
+++ b/script.xbmcbackup/default.py
@@ -87,16 +87,24 @@ class XbmcBackup:
#for the progress bar
progressBar = None
filesLeft = 0
- filesTotal = 0
+ filesTotal = 1
fileManager = None
def __init__(self):
self.local_path = xbmc.translatePath("special://home")
- if(self.Addon.getSetting('remote_path') != '' and
self.Addon.getSetting("backup_name") != ''):
- self.remote_path = self.Addon.getSetting("remote_path") +
self.Addon.getSetting('backup_name') + "/"
-
+ if(self.Addon.getSetting('remote_path_2') != '' and
xbmcvfs.exists(self.Addon.getSetting('remote_path_2'))):
+ self.remote_path = self.Addon.getSetting('remote_path_2')
+ self.Addon.setSetting("remote_path","")
+ elif(self.Addon.getSetting('remote_path') != '' and
xbmcvfs.exists(self.Addon.getSetting("remote_path"))):
+ self.remote_path = self.Addon.getSetting("remote_path")
+
+ if(self.Addon.getSetting("backup_name") != ''):
+ self.remote_path = self.remote_path +
self.Addon.getSetting("backup_name") + "/"
+ else:
+ self.remote_path = ""
+
self.fileManager = FileManager(self.Addon.getAddonInfo('profile'))
self.log("Starting")
@@ -104,6 +112,11 @@ class XbmcBackup:
self.log('Remote Dir: ' + self.remote_path)
def run(self):
+ #check if we should use the progress bar
+ if(self.Addon.getSetting('run_silent') == 'false'):
+ self.progressBar = xbmcgui.DialogProgress()
+ self.progressBar.create('XBMC Backup','Gathering file list.....')
+
#check what mode were are in
if(int(self.Addon.getSetting('addon_mode')) == 0):
self.syncFiles()
@@ -141,11 +154,6 @@ class XbmcBackup:
self.filesTotal = len(fileList)
self.filesLeft = self.filesTotal
- #check if we should use the progress bar
- if(self.Addon.getSetting('run_silent') == 'false'):
- self.progressBar = xbmcgui.DialogProgress()
- self.progressBar.create('XBMC Backup','Running......')
-
#write each file from source to destination
for aFile in fileList:
if(not self.checkCancel()):
diff --git a/script.xbmcbackup/resources/language/English/strings.xml
b/script.xbmcbackup/resources/language/English/strings.xml
index f26e003..c90da25 100644
--- a/script.xbmcbackup/resources/language/English/strings.xml
+++ b/script.xbmcbackup/resources/language/English/strings.xml
@@ -4,11 +4,12 @@
<string id="30011">General</string>
<string id="30012">File Selection</string>
- <string id="30020">Remote Path</string>
+ <string id="30020">Browse Remote Path</string>
<string id="30021">Backup Folder Name</string>
<string id="30022">Run Silent</string>
<string id="30023">Mode</string>
-
+ <string id="30024">Type Remote Path</string>
+
<string id="30030">User Addons</string>
<string id="30031">Addon Data</string>
<string id="30032">Database</string>
diff --git a/script.xbmcbackup/resources/settings.xml
b/script.xbmcbackup/resources/settings.xml
index 353ac50..3712b4a 100644
--- a/script.xbmcbackup/resources/settings.xml
+++ b/script.xbmcbackup/resources/settings.xml
@@ -2,6 +2,7 @@
<settings>
<category id="general" label="30011">
<setting id="addon_mode" type="enum" values="Backup|Restore"
default="Backup" label="30023" />
+ <setting id="remote_path_2" type="text" label="30024"
default="" />
<setting id="remote_path" type="folder" label="30020" />
<setting id="backup_name" type="text" label="30021"
default="xbmc_backup"/>
<setting id="run_silent" type="bool" label="30022"
default="false" />
-----------------------------------------------------------------------
Summary of changes:
script.njoy/addon.xml | 2 +-
script.njoy/changelog.txt | 3 ++
script.njoy/resources/lib/gui.py | 2 +-
script.xbmcbackup/README.txt | 2 +-
script.xbmcbackup/addon.xml | 4 +-
script.xbmcbackup/changelog.txt | 5 ++++
script.xbmcbackup/default.py | 26 +++++++++++++-------
.../resources/language/English/strings.xml | 5 ++-
script.xbmcbackup/resources/settings.xml | 1 +
9 files changed, 34 insertions(+), 16 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
