The branch, eden has been updated
via 3c3269fafcba026ac4777126547ad46ef2067611 (commit)
from f974f5e48828e05d619be4d836d1911629c2d5fe (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=3c3269fafcba026ac4777126547ad46ef2067611
commit 3c3269fafcba026ac4777126547ad46ef2067611
Author: Martijn Kaijser <[email protected]>
Date: Wed Jun 20 01:13:43 2012 +0200
[script.statistics.gsoc2012.scraper] -v0.0.2
diff --git a/script.statistics.gsoc2012.scraper/addon.xml
b/script.statistics.gsoc2012.scraper/addon.xml
index dd5dd7a..35c4758 100644
--- a/script.statistics.gsoc2012.scraper/addon.xml
+++ b/script.statistics.gsoc2012.scraper/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
- id="script.statistics.gsoc.scraper"
- version="0.0.1"
+ id="script.statistics.gsoc2012.scraper"
+ version="0.0.2"
name="Statistics gathering for scraping GSoC 2012"
provider-name="topfs2, Team XBMC">
<requires>
diff --git
a/script.statistics.gsoc2012.scraper/resources/language/English/strings.xml
b/script.statistics.gsoc2012.scraper/resources/language/English/strings.xml
index 080c646..f65ca71 100644
--- a/script.statistics.gsoc2012.scraper/resources/language/English/strings.xml
+++ b/script.statistics.gsoc2012.scraper/resources/language/English/strings.xml
@@ -1,31 +1,31 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<strings>
- <string id="1">Submit?</string>
- <string id="2">{0} episodes, {1} movies</string>
- <string id="3">{0} musicVideos, {1} video files</string>
+ <string id="32001">Submit?</string>
+ <string id="32002">{0} episodes, {1} movies</string>
+ <string id="32003">{0} musicVideos, {1} video files</string>
- <string id="4">GSoC 2012</string>
- <string id="5">Initializing upload...</string>
- <string id="6">Uploading episodes</string>
- <string id="7">Uploading movies</string>
- <string id="8">Uploading music videos</string>
- <string id="9">Uploading unscraped video files</string>
- <string id="10">Initializing extractors...</string>
+ <string id="32004">GSoC 2012</string>
+ <string id="32005">Initializing upload...</string>
+ <string id="32006">Uploading episodes</string>
+ <string id="32007">Uploading movies</string>
+ <string id="32008">Uploading music videos</string>
+ <string id="32009">Uploading unscraped video files</string>
+ <string id="32010">Initializing extractors...</string>
- <string id="11">Extracting episodes</string>
- <string id="12">Extracting movies</string>
- <string id="13">Extracting music videos</string>
- <string id="14">Extracting unscraped videos </string>
+ <string id="32011">Extracting episodes</string>
+ <string id="32012">Extracting movies</string>
+ <string id="32013">Extracting music videos</string>
+ <string id="32014">Extracting unscraped videos </string>
- <string id="15">Push BACK to cancel</string>
- <string id="16">Next!</string>
+ <string id="32015">Push BACK to cancel</string>
+ <string id="32016">Next!</string>
- <string id="17">Submit scraped movies</string>
- <string id="18">Submit scraped episodes</string>
- <string id="19">Submit scraped music videos</string>
- <string id="20">Submit unscraped videos from </string>
+ <string id="v17">Submit scraped movies</string>
+ <string id="32018">Submit scraped episodes</string>
+ <string id="32019">Submit scraped music videos</string>
+ <string id="32020">Submit unscraped videos from </string>
- <string id="21">Server down</string>
- <string id="22">The statistics server seems to be down</string>
+ <string id="32021">Server down</string>
+ <string id="32022">The statistics server seems to be down</string>
</strings>
diff --git a/script.statistics.gsoc2012.scraper/states.py
b/script.statistics.gsoc2012.scraper/states.py
index 5b99fa5..4f4456c 100644
--- a/script.statistics.gsoc2012.scraper/states.py
+++ b/script.statistics.gsoc2012.scraper/states.py
@@ -23,7 +23,7 @@ class SubmitState(object):
def doModal(self):
dialog = xbmcgui.Dialog()
- ret = dialog.yesno(__settings__.getLocalizedString(1),
__settings__.getLocalizedString(2).format(len(self.episodes),
len(self.movies)),
__settings__.getLocalizedString(3).format(len(self.musicVideos),
len(self.videoFiles)))
+ ret = dialog.yesno(__settings__.getLocalizedString(32001),
__settings__.getLocalizedString(32002).format(len(self.episodes),
len(self.movies)),
__settings__.getLocalizedString(32003).format(len(self.musicVideos),
len(self.videoFiles)))
if ret:
chunksize = 20
@@ -31,32 +31,32 @@ class SubmitState(object):
total = len(self.episodes) + len(self.movies) +
len(self.musicVideos) + len(self.videoFiles)
progress = xbmcgui.DialogProgress()
- ret =
progress.create(__settings__.getLocalizedString(4),
__settings__.getLocalizedString(5), "")
+ ret =
progress.create(__settings__.getLocalizedString(32004),
__settings__.getLocalizedString(32005), "")
for m in chunks(self.episodes, chunksize):
server.uploadMedia("episodes", m)
- progress.update((percentage * 100) / total,
__settings__.getLocalizedString(6))
+ progress.update((percentage * 100) / total,
__settings__.getLocalizedString(32006))
percentage += chunksize
if progress.iscanceled():
return
for m in chunks(self.movies, chunksize):
server.uploadMedia("movies", m)
- progress.update((percentage * 100) / total,
__settings__.getLocalizedString(7))
+ progress.update((percentage * 100) / total,
__settings__.getLocalizedString(32007))
percentage += chunksize
if progress.iscanceled():
return
for m in chunks(self.musicVideos, chunksize):
server.uploadMedia("musicvideos", m)
- progress.update((percentage * 100) / total,
__settings__.getLocalizedString(8))
+ progress.update((percentage * 100) / total,
__settings__.getLocalizedString(32008))
percentage += chunksize
if progress.iscanceled():
return
for m in chunks(self.videoFiles, chunksize):
server.uploadMedia("videofiles", m)
- progress.update((percentage * 100) / total,
__settings__.getLocalizedString(9))
+ progress.update((percentage * 100) / total,
__settings__.getLocalizedString(32009))
percentage += chunksize
if progress.iscanceled():
return
@@ -73,7 +73,7 @@ class GatherState(object):
self.extractionSteps = extractionSteps
def doModal(self):
- ret =
self.gatherDialog.create(__settings__.getLocalizedString(4),
__settings__.getLocalizedString(10), "")
+ ret =
self.gatherDialog.create(__settings__.getLocalizedString(32004),
__settings__.getLocalizedString(32010), "")
episodes = list()
movies = list()
@@ -85,17 +85,17 @@ class GatherState(object):
files = set()
if "episodes" in self.extractionSteps:
def episodeProgress(percentage):
- self.gatherDialog.update(percentage /
self.steps, __settings__.getLocalizedString(11), "", "")
+ self.gatherDialog.update(percentage /
self.steps, __settings__.getLocalizedString(32011), "", "")
episodes = extraction.extractEpisodes(files,
episodeProgress, self.gatherDialog.iscanceled)
if "movies" in self.extractionSteps:
def movieProgress(percentage):
- self.gatherDialog.update((100 +
percentage) / self.steps, __settings__.getLocalizedString(12), "", "")
+ self.gatherDialog.update((100 +
percentage) / self.steps, __settings__.getLocalizedString(32012), "", "")
movies = extraction.extractMovies(files,
movieProgress, self.gatherDialog.iscanceled)
if "musicvideos" in self.extractionSteps:
def musicVideosProgress(percentage):
- self.gatherDialog.update((100 +
percentage) / self.steps, __settings__.getLocalizedString(13), "", "")
+ self.gatherDialog.update((100 +
percentage) / self.steps, __settings__.getLocalizedString(32013), "", "")
musicVideos =
extraction.extractMusicVideos(files, musicVideosProgress,
self.gatherDialog.iscanceled)
sources = [s for s in getSources() if s["file"] in
self.extractionSteps]
@@ -111,7 +111,7 @@ class GatherState(object):
s = string.join(['.' for s in
range(source["tick"])])
offset = 200 + i * nbrSources
- self.gatherDialog.update((offset +
source["percentage"]) / self.steps, __settings__.getLocalizedString(14) + s,
source["label"], "")
+ self.gatherDialog.update((offset +
source["percentage"]) / self.steps, __settings__.getLocalizedString(32014) + s,
source["label"], "")
return self.gatherDialog.iscanceled()
@@ -133,21 +133,21 @@ class GatherState(object):
class InitialWindow(xbmcgui.Window):
def __init__(self):
- self.strActionInfo = xbmcgui.ControlLabel(0, 0, 300, 200,
__settings__.getLocalizedString(15), 'font13', '0xFFFFFFFF')
+ self.strActionInfo = xbmcgui.ControlLabel(0, 0, 300, 200,
__settings__.getLocalizedString(32015), 'font13', '0xFFFFFFFF')
self.addControl(self.strActionInfo)
self.choiceButton = list()
self.choiceID = list()
- self.gather = xbmcgui.ControlButton(800, 50, 200, 100,
__settings__.getLocalizedString(16))
+ self.gather = xbmcgui.ControlButton(800, 50, 200, 100,
__settings__.getLocalizedString(32016))
self.addControl(self.gather)
- self.addChoice(__settings__.getLocalizedString(17), "movies")
- self.addChoice(__settings__.getLocalizedString(18), "episodes")
- self.addChoice(__settings__.getLocalizedString(19),
"musicvideos")
+ self.addChoice(__settings__.getLocalizedString(32017), "movies")
+ self.addChoice(__settings__.getLocalizedString(32018),
"episodes")
+ self.addChoice(__settings__.getLocalizedString(32019),
"musicvideos")
for source in getSources():
- self.addChoice(__settings__.getLocalizedString(20) +
'"' + source["label"] + u'"', source["file"])
+ self.addChoice(__settings__.getLocalizedString(32020) +
'"' + source["label"] + u'"', source["file"])
self.setFocus(self.choiceButton[0])
self.gather.controlLeft(self.choiceButton[0])
@@ -178,7 +178,7 @@ class CheckServerState(object):
self.sm.switchTo(InitialWindow())
else:
dialog = xbmcgui.Dialog()
- dialog.ok(__settings__.getLocalizedString(21),
__settings__.getLocalizedString(22))
+ dialog.ok(__settings__.getLocalizedString(32021),
__settings__.getLocalizedString(32022))
def close(self):
pass
-----------------------------------------------------------------------
Summary of changes:
script.statistics.gsoc2012.scraper/.gitignore | 27 ++++++++++++
script.statistics.gsoc2012.scraper/addon.xml | 4 +-
script.statistics.gsoc2012.scraper/changelog.txt | 5 ++
.../resources/language/English/strings.xml | 44 ++++++++++----------
script.statistics.gsoc2012.scraper/states.py | 36 ++++++++--------
5 files changed, 74 insertions(+), 42 deletions(-)
create mode 100644 script.statistics.gsoc2012.scraper/.gitignore
create mode 100644 script.statistics.gsoc2012.scraper/changelog.txt
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
