The branch, dharma has been updated
via fb2432b58e607aa6956fdf4d38a9518d782b76d2 (commit)
from 586918b789a705ce1288170d6ed731e75427a2c0 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=fb2432b58e607aa6956fdf4d38a9518d782b76d2
commit fb2432b58e607aa6956fdf4d38a9518d782b76d2
Author: spiff <[email protected]>
Date: Sun Jan 8 10:09:59 2012 +0100
[plugin.video.xbmcflicks] updated to version 1.0.22
diff --git a/plugin.video.xbmcflicks/addon.xml
b/plugin.video.xbmcflicks/addon.xml
index 59d4eb6..6e6c3e8 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.20"
+ version="1.0.18"
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 09b12e5..3bb0566 100644
--- a/plugin.video.xbmcflicks/changelog.txt
+++ b/plugin.video.xbmcflicks/changelog.txt
@@ -12,5 +12,3 @@
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
-1.0.20 - fixed issue with instant queue browse by genre
\ 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 5019883..bb9642a 100644
--- a/plugin.video.xbmcflicks/resources/lib/iqueue.py
+++ b/plugin.video.xbmcflicks/resources/lib/iqueue.py
@@ -564,21 +564,18 @@ def getMovieDataFromFeed(curX, curQueueItem, bIsEpisode,
netflix, instantAvail,
#title
- matchTitle = re.search(r'[\'"]title[\'"]: {.*?[\'"]regular[\'"]:
u{0,1}(\'|")(.*?)\1.*?},', curQueueItem, re.DOTALL | re.MULTILINE)
+ matchTitle = re.search(r'[\'"]title[\'"]: {.*?[\'"]regular[\'"]:
u{0,1}[\'](.*?)[\'].*?},', curQueueItem, re.DOTALL | re.MULTILINE)
if matchTitle:
- curX.Title = matchTitle.group(2).strip()
+ curX.Title = matchTitle.group(1).strip()
else:
- matchTitleSQuoted = re.search(r'[\'"]title[\'"]:
{.*?[\'"]regular[\'"]: u{0,1}[\'](.*?)[\'].*?},', curQueueItem, re.DOTALL |
re.MULTILINE)
- if matchTitleSQuoted:
- curX.Title = matchTitleSQuoted.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:
- 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()
+ 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)
@@ -678,7 +675,7 @@ def getMovieDataFromFeed(curX, curQueueItem, bIsEpisode,
netflix, instantAvail,
curX.ID = matchIds2.group(2)
else:
#print "didn't match matchIds2"
- matchIds3 = re.search(r'"media_src":
"http://.*?.nflximg.com/[^/]*?/boxshots/(small|tiny|large|ghd|small_epx|ghd_epx|large_epx|88_epx|tiny_epx)/(\d{1,15}).jpg"',
curQueueItem, re.DOTALL | re.IGNORECASE | re.MULTILINE)
+ matchIds3 = re.search(r'"media_src":
"http://.*?.nflximg.com/us/boxshots/(small|tiny|large|ghd|small_epx|ghd_epx|large_epx|88_epx|tiny_epx)/(\d{1,15}).jpg"',
curQueueItem, re.DOTALL | re.IGNORECASE | re.MULTILINE)
if matchIds3:
#print "id regex: matched matchIds3"
curX.FullId = matchIds3.group(1)
@@ -860,7 +857,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 matchSeasonNum:
+ if matchEpNum:
curXe.TvEpisodeEpisodeSeasonNum =
str(matchSeasonNum.group("seasonNum"))
matchShortTitle = re.search('(?sm)u{0,1}[\'"]episode_short_raw[\'"]:
u{0,1}[\'"](?P<shorttitle>.*?)[\'"]', matchAllEp.group())
-----------------------------------------------------------------------
Summary of changes:
plugin.video.xbmcflicks/addon.xml | 2 +-
plugin.video.xbmcflicks/changelog.txt | 2 -
plugin.video.xbmcflicks/resources/lib/iqueue.py | 25 ++++++++++------------
3 files changed, 12 insertions(+), 17 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual
desktops for less than the cost of PCs and save 60% on VDI infrastructure
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
