The branch, frodo has been updated
via 064626288a5d02bb709e3087cab51053630e175c (commit)
from dafd6249e9cc903a942ac2282864d28096f7b59c (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=064626288a5d02bb709e3087cab51053630e175c
commit 064626288a5d02bb709e3087cab51053630e175c
Author: beenje <[email protected]>
Date: Mon Apr 1 10:17:57 2013 +0200
[plugin.video.elisa.viihde] updated to version 0.0.6
diff --git a/plugin.video.elisa.viihde/README.md
b/plugin.video.elisa.viihde/README.md
index b5d3801..f323630 100644
--- a/plugin.video.elisa.viihde/README.md
+++ b/plugin.video.elisa.viihde/README.md
@@ -2,7 +2,7 @@ XBMC-plugin Elisa Viihteelle
https://github.com/anylonen/XBMC-Elisa-Viihde-plugin/wiki
-Original author is zippoman. Fixes and changes are done by purtsi, teerytko
and anylonen
+Original author is zippoman. Fixes and changes are done by purtsi, teerytko,
anylonen and ottok.
diff --git a/plugin.video.elisa.viihde/addon.py
b/plugin.video.elisa.viihde/addon.py
index e93d626..5f253bd 100644
--- a/plugin.video.elisa.viihde/addon.py
+++ b/plugin.video.elisa.viihde/addon.py
@@ -204,6 +204,18 @@ def add_watch_link(name, progid, totalItems=None,
**kwargs):
def get_prog_data(prog_id):
prog_url = "http://elisaviihde.fi/etvrecorder/program.sl?programid="; +
str(prog_id) + "&ajax"
+ # Limit concurrent download threads to 60
+ # It there are too many threads (depending on hardware and OS)
+ # the master Python process will stop execution and whole plugin fails.
+ #
+ # Also it seems that Elisa.fi is throttling concurrent requests from
+ # same client, so better not bombard them with over 300 requests per
+ # second anyway.
+ #
+ # Best solution would be a thread pool, but this quick hack
+ # "while sleep" solves the problem too.
+ while threading.active_count() > 60:
+ time.sleep(2)
req = urllib2.Request(prog_url)
response = urllib2.urlopen(req)
link = response.read()
@@ -243,12 +255,12 @@ def watch_program(prog_id):
def fix_chars(string):
string = string.replace("%20", " ")
- string = re.sub('%C3%A4','\u00E4',string) #ä
- string = re.sub('%C3%B6','\u00F6',string) #ö
- string = re.sub('%C3%A5','\u00E5',string) #å
- string = re.sub('%C3%84','\u00C4',string) #Ä
- string = re.sub('%C3%96','\u00D6',string) #Ö
- string = re.sub('%C3%85','\u00C5',string) #Å
+ string = re.sub('%C3%A4','\u00E4',string) #\E4
+ string = re.sub('%C3%B6','\u00F6',string) #\F6
+ string = re.sub('%C3%A5','\u00E5',string) #\E5
+ string = re.sub('%C3%84','\u00C4',string) #\C4
+ string = re.sub('%C3%96','\u00D6',string) #\D6
+ string = re.sub('%C3%85','\u00C5',string) #\C5
string = re.sub('%2C', ',',string) #pilkku
string = re.sub('%26', '&',string) #&
string = re.sub('%3F', '?',string) #?
@@ -305,6 +317,8 @@ def show_dir(id):
else:
date_name = str(vkopaivat[weekday_numb]) + " " +
time.strftime("%d.%m.%Y %H:%M", parsed_time)
+ date_string = time.strftime("%Y-%m-%d", parsed_time)
+
name = print_star + row['name'] + " (" + row['channel'] + ", " +
date_name + ")"
link = add_watch_link(name,
@@ -312,7 +326,7 @@ def show_dir(id):
playcount=row['viewcount'],
totalItems=totalItems,
duration=row['length'],
- date=date_name
+ date=date_string
)
t = UpdateProgramDataThread(row['program_id'],
link)
diff --git a/plugin.video.elisa.viihde/addon.xml
b/plugin.video.elisa.viihde/addon.xml
index d90910b..2560819 100644
--- a/plugin.video.elisa.viihde/addon.xml
+++ b/plugin.video.elisa.viihde/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.elisa.viihde" name="Elisa Viihde" version="0.0.5"
provider-name="zippoman, purtsi, teerytko, anylonen">
+<addon id="plugin.video.elisa.viihde" name="Elisa Viihde" version="0.0.6"
provider-name="zippoman, purtsi, teerytko, anylonen">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.simplejson"/>
diff --git a/plugin.video.elisa.viihde/changelog.txt
b/plugin.video.elisa.viihde/changelog.txt
index 39fe63c..5cffd46 100644
--- a/plugin.video.elisa.viihde/changelog.txt
+++ b/plugin.video.elisa.viihde/changelog.txt
@@ -1,3 +1,7 @@
+[B]0.0.6[/B]
+- Fixed date format and plugin crash bugs. (OttoK)
+- Plugin now compatible with latest OpenElec 3.0.0 and should work better for
all other XBMC users too. (OttoK)
+
[B]0.0.5[/B]
- Removed the download of the thumbnails and program info (it's now faster
again)
- Added search functionality
-----------------------------------------------------------------------
Summary of changes:
plugin.video.elisa.viihde/README.md | 2 +-
plugin.video.elisa.viihde/addon.py | 28 +++++++++++++++++++++-------
plugin.video.elisa.viihde/addon.xml | 2 +-
plugin.video.elisa.viihde/changelog.txt | 4 ++++
4 files changed, 27 insertions(+), 9 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Own the Future-Intel® Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest.
Compete for recognition, cash, and the chance to get your game
on Steam. $5K grand prize plus 10 genre and skill prizes.
Submit your demo by 6/6/13. http://p.sf.net/sfu/intel_levelupd2d
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
