The branch, dharma has been updated
via 2562c9866f144d14286c4b4983cc56c711ea413c (commit)
via 6de17f58fa0f7ec65a8cda719700695611c85ba1 (commit)
from 1c1e54d2d31c9bc50c26622c491ba03f20c1cf62 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=2562c9866f144d14286c4b4983cc56c711ea413c
commit 2562c9866f144d14286c4b4983cc56c711ea413c
Author: spiff <[email protected]>
Date: Wed May 4 10:02:19 2011 +0200
[plugin.video.xbmcflicks] updated to version 1.0.19
diff --git a/plugin.video.xbmcflicks/addon.xml
b/plugin.video.xbmcflicks/addon.xml
index 6e6c3e8..7ffd3a0 100644
--- a/plugin.video.xbmcflicks/addon.xml
+++ b/plugin.video.xbmcflicks/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.xbmcflicks"
name="XBMC Flicks - Netflix for XBMC"
- version="1.0.18"
+ version="1.0.19"
provider-name="TeamUMX">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.video.xbmcflicks/changelog.txt
b/plugin.video.xbmcflicks/changelog.txt
index 3bb0566..da16e41 100644
--- a/plugin.video.xbmcflicks/changelog.txt
+++ b/plugin.video.xbmcflicks/changelog.txt
@@ -12,3 +12,4 @@
1.0.16 - fixed issue with tv episodes where some shows would no longer show
any episodes (the format changed from netflix), fixed issue with OSX launching
firefox for initial auth (requires firefox to be installed on your system to
the apps folder)
1.0.17 - fixed issue with episodes when pilot is listed, fixed .ca links for
Canada Netflix, fixed menu items for Canada Users.. Thanks to qumip for code
fixes
1.0.18 - fixed issue with not all instant queues showing up, fixed write issue
with some os's (w+ used now), fixed issue with title's being cut off at the
first quote, fixed synopsis not always being parsed if only a short synopsis is
available, fixed " and & in title
+1.0.19 - fixed issue with single quote in title name, fixed script error with
season number parsing
\ No newline at end of file
diff --git a/plugin.video.xbmcflicks/resources/lib/iqueue.py
b/plugin.video.xbmcflicks/resources/lib/iqueue.py
index bb9642a..88adfa9 100644
--- a/plugin.video.xbmcflicks/resources/lib/iqueue.py
+++ b/plugin.video.xbmcflicks/resources/lib/iqueue.py
@@ -564,18 +564,21 @@ def getMovieDataFromFeed(curX, curQueueItem, bIsEpisode,
netflix, instantAvail,
#title
- matchTitle = re.search(r'[\'"]title[\'"]: {.*?[\'"]regular[\'"]:
u{0,1}[\'](.*?)[\'].*?},', curQueueItem, re.DOTALL | re.MULTILINE)
+ matchTitle = re.search(r'[\'"]title[\'"]: {.*?[\'"]regular[\'"]:
u{0,1}(\'|")(.*?)\1.*?},', curQueueItem, re.DOTALL | re.MULTILINE)
if matchTitle:
- curX.Title = matchTitle.group(1).strip()
+ curX.Title = matchTitle.group(2).strip()
else:
- matchTitleQuoted = re.search(r'[\'"]title[\'"]: {.*?[\'"]regular[\'"]:
u{0,1}[\'"](.*?)[\'"].*?},', curQueueItem, re.DOTALL | re.MULTILINE)
- if matchTitleQuoted:
- curX.Title = matchTitleQuoted.group(1).strip()
+ matchTitleSQuoted = re.search(r'[\'"]title[\'"]:
{.*?[\'"]regular[\'"]: u{0,1}[\'](.*?)[\'].*?},', curQueueItem, re.DOTALL |
re.MULTILINE)
+ if matchTitleSQuoted:
+ curX.Title = matchTitleSQuoted.group(1).strip()
else:
- matchTitle3 = re.search('"ShortName": "(.*?)"',curQueueItem,
re.DOTALL | re.MULTILINE)
- if matchTitle3:
- curX.Title = matchTitle3.group(1).strip()
-
+ matchTitleQuoted = re.search(r'[\'"]title[\'"]:
{.*?[\'"]regular[\'"]: u{0,1}[\'"](.*?)[\'"].*?},', curQueueItem, re.DOTALL |
re.MULTILINE)
+ if matchTitleQuoted:
+ curX.Title = matchTitleQuoted.group(1).strip()
+ else:
+ matchTitle3 = re.search('"ShortName": "(.*?)"',curQueueItem,
re.DOTALL | re.MULTILINE)
+ if matchTitle3:
+ curX.Title = matchTitle3.group(1).strip()
#position
matchPosition = re.search(r'[\'"]position[\'"]: u{0,1}[\'"](\d{1,6})[\'"],
', curQueueItem, re.DOTALL | re.MULTILINE)
@@ -857,7 +860,7 @@ def getMovieDataFromFeed(curX, curQueueItem, bIsEpisode,
netflix, instantAvail,
curXe.TvEpisodeEpisodeNum = str(matchEpNum.group("episodeNum"))
matchSeasonNum = re.search('(?sm)u{0,1}[\'"]season_number[\'"]:
u{0,1}(?P<seasonNum>\\d{1,3})', matchAllEp.group())
- if matchEpNum:
+ if matchSeasonNum:
curXe.TvEpisodeEpisodeSeasonNum =
str(matchSeasonNum.group("seasonNum"))
matchShortTitle = re.search('(?sm)u{0,1}[\'"]episode_short_raw[\'"]:
u{0,1}[\'"](?P<shorttitle>.*?)[\'"]', matchAllEp.group())
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=6de17f58fa0f7ec65a8cda719700695611c85ba1
commit 6de17f58fa0f7ec65a8cda719700695611c85ba1
Author: spiff <[email protected]>
Date: Wed May 4 10:01:22 2011 +0200
[plugin.video.mediathek] updated to version 0.2.0
diff --git a/plugin.video.mediathek/addon.xml b/plugin.video.mediathek/addon.xml
index d51674f..bf9e6e1 100644
--- a/plugin.video.mediathek/addon.xml
+++ b/plugin.video.mediathek/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="plugin.video.mediathek"
- version="0.1.9"
+ version="0.2.0"
name="Mediathek"
provider-name="Raptor 2101 [[email protected]]">
<requires>
diff --git a/plugin.video.mediathek/changelog.txt
b/plugin.video.mediathek/changelog.txt
index ccdf9b7..5fa0b1b 100644
--- a/plugin.video.mediathek/changelog.txt
+++ b/plugin.video.mediathek/changelog.txt
@@ -1,3 +1,4 @@
+0.2.0 - FIX: Minor Bugfixes
0.1.9 - FIX: ORF Playback
FIX: Progressbar is displayed corectly
0.1.8 - ZDF Changes their Interface, reimplement it
diff --git a/plugin.video.mediathek/default.py
b/plugin.video.mediathek/default.py
index 4b7a5ee..6153a81 100644
--- a/plugin.video.mediathek/default.py
+++ b/plugin.video.mediathek/default.py
@@ -78,7 +78,7 @@ else:
if(action == "openTopicPage"):
link = urllib.unquote_plus(params.get("link", ""));
gui.log(link);
- mediathek.buildPageMenu(link);
+ mediathek.buildPageMenu(link, 0);
elif(action == "openPlayList"):
link = urllib.unquote_plus(params.get("link", ""));
gui.log(link);
diff --git a/plugin.video.mediathek/mediathek/zdf.py
b/plugin.video.mediathek/mediathek/zdf.py
index 7e8cd2d..62b9581 100644
--- a/plugin.video.mediathek/mediathek/zdf.py
+++ b/plugin.video.mediathek/mediathek/zdf.py
@@ -166,7 +166,6 @@ class ZDFMediathek(Mediathek):
detail = configXml.getElementsByTagName("detail")[0].childNodes[0].data
dateString =
configXml.getElementsByTagName("airtime")[0].childNodes[0].data
date = time.strptime(dateString,"%d.%m.%Y %H:%M");
- self.gui.log("Seek");
size = 0;
picture = "";
for picElement in configXml.getElementsByTagName("teaserimage"):
@@ -179,14 +178,17 @@ class ZDFMediathek(Mediathek):
size = diag;
self.gui.log("%d %s"%(diag,picElement.childNodes[0].data));
picture = picElement.childNodes[0].data;
- self.gui.log("Done");
links = {};
for streamObject in configXml.getElementsByTagName("formitaet"):
baseType = streamObject.getAttribute("basetype")
if(baseType.find(self.baseType)>-1):
+
url = streamObject.getElementsByTagName("url")[0].childNodes[0].data;
- size =
int(streamObject.getElementsByTagName("filesize")[0].childNodes[0].data);
+ try:
+ size =
int(streamObject.getElementsByTagName("filesize")[0].childNodes[0].data);
+ except:
+ size = 0;
if(self.baseType == "rtmp_smil_http"):
links = self.getRtmpLinks(url, size);
break;
@@ -220,7 +222,7 @@ class ZDFMediathek(Mediathek):
self.gui.buildVideoLink(DisplayObject(title,"",picture,detail,links,True,
date),self,self.getItemCount());
except:
self.gui.log("Error while processing the xml-file: %s"%link);
- self.gui.log(xmlPage);
+ print xmlPage;
self.gui.log("Exception: ");
traceback.print_exc();
self.gui.log("Stacktrace: ");
-----------------------------------------------------------------------
Summary of changes:
plugin.video.mediathek/addon.xml | 2 +-
plugin.video.mediathek/changelog.txt | 1 +
plugin.video.mediathek/default.py | 2 +-
plugin.video.mediathek/mediathek/zdf.py | 10 ++++++----
plugin.video.xbmcflicks/addon.xml | 2 +-
plugin.video.xbmcflicks/changelog.txt | 1 +
plugin.video.xbmcflicks/resources/lib/iqueue.py | 23 +++++++++++++----------
7 files changed, 24 insertions(+), 17 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
