The branch, dharma has been updated
via 78394248cda14a12e7d6491780cdc7a1947ef402 (commit)
via 1b7fbb659da43a0016825422f01531083754458e (commit)
from dcdd1d4023f1631c7b27c13f7d499788ae1c5ebc (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=78394248cda14a12e7d6491780cdc7a1947ef402
commit 78394248cda14a12e7d6491780cdc7a1947ef402
Author: spiff <[email protected]>
Date: Sun Mar 27 14:14:48 2011 +0200
[plugin.video.xbmcflicks] updated to version 1.0.17
diff --git a/plugin.video.xbmcflicks/addon.xml
b/plugin.video.xbmcflicks/addon.xml
index 68ccd2a..00c1557 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.16"
+ version="1.0.17"
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 4519f8a..45b07fa 100644
--- a/plugin.video.xbmcflicks/changelog.txt
+++ b/plugin.video.xbmcflicks/changelog.txt
@@ -9,4 +9,5 @@
1.0.13 - added browse by genre to instant watch items, tv shows now appear as
a folder, when opened they display the episdoes
1.0.14 - fixed pathing issues by calling actual paths instead of special://
pathing for addon launch loc
1.0.15 - fixed issue with tv episodes (when set to expand) would fail to
display (invalid setting for director info)
-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)
\ No newline at end of file
+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
\ 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 3044e54..62e82aa 100644
--- a/plugin.video.xbmcflicks/resources/lib/iqueue.py
+++ b/plugin.video.xbmcflicks/resources/lib/iqueue.py
@@ -260,7 +260,10 @@ def writeLinkFile(id, title):
player = "WiPlayerCommunityAPI"
if(useAltPlayer):
player = "WiPlayer"
- redirect = "<!doctype html public \"-//W3C//DTD HTML 4.0
Transitional//EN\"><html><head><title>Requesting Video: " + title +
"</title><meta http-equiv=\"REFRESH\" content=\"0;url=http://www.netflix.com/";
+ player + "?lnkctr=apiwn&nbb=y&devKey=gnexy7jajjtmspegrux7c3dj&movieid=" + id
+ "\"></head><body bgcolor=\"#FF0000\"> <p>Redirecting to Netflix in a moment
...</p></body></html>"
+ if(not IN_CANADA):
+ redirect = "<!doctype html public \"-//W3C//DTD HTML 4.0
Transitional//EN\"><html><head><title>Requesting Video: " + title +
"</title><meta http-equiv=\"REFRESH\" content=\"0;url=http://www.netflix.com/";
+ player + "?lnkctr=apiwn&nbb=y&devKey=gnexy7jajjtmspegrux7c3dj&movieid=" + id
+ "\"></head><body bgcolor=\"#FF0000\"> <p>Redirecting to Netflix in a moment
...</p></body></html>"
+ else:
+ redirect = "<!doctype html public \"-//W3C//DTD HTML 4.0
Transitional//EN\"><html><head><title>Requesting Video: " + title +
"</title><meta http-equiv=\"REFRESH\" content=\"0;url=http://www.netflix.ca/"; +
player + "?lnkctr=apiwn&nbb=y&devKey=gnexy7jajjtmspegrux7c3dj&movieid=" + id +
"\"></head><body bgcolor=\"#FF0000\"> <p>Redirecting to Netflix in a moment
...</p></body></html>"
f = open(fileLoc,'r+')
f.write(redirect)
f.close()
@@ -848,9 +851,9 @@ def getMovieDataFromFeed(curX, curQueueItem, bIsEpisode,
netflix, instantAvail,
curXe.TitleShort = shortTitleString
else:
if(not forceExpand):
- curXe.TitleShort = curX.TitleShort + " " + "Episode: " +
curXe.TvEpisodeEpisodeNum + " " + shortTitleString
+ curXe.TitleShort = curX.TitleShort + " " + "Episode: " +
str(curXe.TvEpisodeEpisodeNum) + " " + shortTitleString
else:
- curXe.TitleShort = "Episode: " + curXe.TvEpisodeEpisodeNum + "
- " + shortTitleString
+ curXe.TitleShort = "Episode: " +
str(curXe.TvEpisodeEpisodeNum) + " - " + shortTitleString
curXe.TvShow = True
curXe.TvShowLink = curX.TvShowLink
diff --git a/plugin.video.xbmcflicks/resources/lib/menu.py
b/plugin.video.xbmcflicks/resources/lib/menu.py
index 0fd4077..81fe46b 100644
--- a/plugin.video.xbmcflicks/resources/lib/menu.py
+++ b/plugin.video.xbmcflicks/resources/lib/menu.py
@@ -286,21 +286,21 @@ def show_instant_menu():
xbmcplugin.endOfDirectory(handle=handle, succeeded=True)
def show_disc_menu():
- addDirectoryItem(name=SUBMENUD1, parameters={ PARAMETER_KEY_MODE:MODED1 },
isFolder=True, thumbnail=os.path.join(resourcePath, 'disc_queue_all.png'))
- addDirectoryItem(name=SUBMENUD1m, parameters={ PARAMETER_KEY_MODE:MODED1m
}, isFolder=True, thumbnail=os.path.join(resourcePath, 'disc_queue_movies.png'))
- addDirectoryItem(name=SUBMENUD1t, parameters={ PARAMETER_KEY_MODE:MODED1t
}, isFolder=True, thumbnail=os.path.join(resourcePath, 'disc_queue_tv.png'))
-
if(not IN_CANADA):
+ addDirectoryItem(name=SUBMENUD1, parameters={ PARAMETER_KEY_MODE:MODED1
}, isFolder=True, thumbnail=os.path.join(resourcePath, 'disc_queue_all.png'))
+ addDirectoryItem(name=SUBMENUD1m, parameters={
PARAMETER_KEY_MODE:MODED1m }, isFolder=True,
thumbnail=os.path.join(resourcePath, 'disc_queue_movies.png'))
+ addDirectoryItem(name=SUBMENUD1t, parameters={
PARAMETER_KEY_MODE:MODED1t }, isFolder=True,
thumbnail=os.path.join(resourcePath, 'disc_queue_tv.png'))
addDirectoryItem(name=SUBMENUD7, parameters={ PARAMETER_KEY_MODE:MODED7
}, isFolder=True, thumbnail=os.path.join(resourcePath,
'disc_top25_bygenre.png'))
-
- addDirectoryItem(name=SUBMENUD2, parameters={ PARAMETER_KEY_MODE:MODED2 },
isFolder=True, thumbnail=os.path.join(resourcePath, 'disc_search.png'))
- addDirectoryItem(name=SUBMENUD3, parameters={ PARAMETER_KEY_MODE:MODED3 },
isFolder=True, thumbnail=os.path.join(resourcePath, 'disc_queue_at_home.png'))
+ addDirectoryItem(name=SUBMENUD2, parameters={ PARAMETER_KEY_MODE:MODED2
}, isFolder=True, thumbnail=os.path.join(resourcePath, 'disc_search.png'))
+ addDirectoryItem(name=SUBMENUD3, parameters={ PARAMETER_KEY_MODE:MODED3
}, isFolder=True, thumbnail=os.path.join(resourcePath,
'disc_queue_at_home.png'))
xbmcplugin.endOfDirectory(handle=handle, succeeded=True)
def show_rentalhistory_menu():
- addDirectoryItem(name=SUBMENUR1, parameters={ PARAMETER_KEY_MODE:MODER1 },
isFolder=True, thumbnail=os.path.join(resourcePath,
'rental_history_shipped.png'))
- addDirectoryItem(name=SUBMENUR2, parameters={ PARAMETER_KEY_MODE:MODER2 },
isFolder=True, thumbnail=os.path.join(resourcePath,
'rental_history_returned.png'))
+ if(not IN_CANADA):
+ addDirectoryItem(name=SUBMENUR1, parameters={ PARAMETER_KEY_MODE:MODER1
}, isFolder=True, thumbnail=os.path.join(resourcePath,
'rental_history_shipped.png'))
+ addDirectoryItem(name=SUBMENUR2, parameters={ PARAMETER_KEY_MODE:MODER2
}, isFolder=True, thumbnail=os.path.join(resourcePath,
'rental_history_returned.png'))
+
addDirectoryItem(name=SUBMENUR3, parameters={ PARAMETER_KEY_MODE:MODER3 },
isFolder=True, thumbnail=os.path.join(resourcePath,
'rental_history_watched.png'))
xbmcplugin.endOfDirectory(handle=handle, succeeded=True)
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=1b7fbb659da43a0016825422f01531083754458e
commit 1b7fbb659da43a0016825422f01531083754458e
Author: spiff <[email protected]>
Date: Sun Mar 27 14:13:03 2011 +0200
[plugin.video.pennyarcadetv] updated to version 1.0.1
diff --git a/plugin.video.pennyarcadetv/addon.xml
b/plugin.video.pennyarcadetv/addon.xml
index d5e13a6..76ffcff 100644
--- a/plugin.video.pennyarcadetv/addon.xml
+++ b/plugin.video.pennyarcadetv/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.pennyarcadetv"
name="Penny Arcade TV"
- version="1.0.0"
+ version="1.0.1"
provider-name="jorsoban">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.video.pennyarcadetv/changelog.txt
b/plugin.video.pennyarcadetv/changelog.txt
index 105ce55..6cd8da4 100644
--- a/plugin.video.pennyarcadetv/changelog.txt
+++ b/plugin.video.pennyarcadetv/changelog.txt
@@ -1,3 +1,7 @@
+[B]Version 1.0.1 - 2011-03-27[/B]
+
+- Fix issue with new show
+
[B]Version 1.0.0 - 2011-03-20[/B]
- Cleaned up for repo submission
diff --git a/plugin.video.pennyarcadetv/default.py
b/plugin.video.pennyarcadetv/default.py
index 75cc4e7..686bb42 100644
--- a/plugin.video.pennyarcadetv/default.py
+++ b/plugin.video.pennyarcadetv/default.py
@@ -58,35 +58,42 @@ def listShowsAndLatest(showOnlyLatest):
#Get a list of found shows and current episodes
for div in infoDivs:
- links = div.findAll("a")
-
- if links[0]["title"] == "Watch Now":
- ep = {}
- #Show title
- ep["title"] = links[1]["title"]
-
- #Episode title
- match = titleRegex.match(links[2]["title"])
- if(match == None):
- match = onlyNumberRegex.match(links[2]["title"])
- parts = match.groupdict()
- ep["title"] += " - %sx%s" % (parts["s"], parts["ep"])
- if "title" in parts:
- ep["title"] += " - " + parts["title"]
-
- #Image and url
- ep["imgurl"] = __baseURL__ + div.parent.img["src"]
- ep["url"] = __baseURL__ + links[0]["href"]
-
- foundEps.append(ep)
- else:
- #Todo - Get show infos to add as some info label? Doesn"t seem to
be a good view
- #that shows the info without having other fields left empty..
- show = {}
- show["title"] = links[0]["title"]
- show["imgurl"] = __baseURL__ + div.parent.a.img["src"]
- show["url"] = __baseURL__ + links[0]["href"]
- foundShows.append(show)
+ try:
+ links = div.findAll("a")
+
+ if links[0]["title"] == "Watch Now":
+ ep = {}
+ #Show title
+ ep["title"] = links[1]["title"]
+
+ #Episode title
+ titleParts = titleRegex.match(links[2]["title"]) or
onlyNumberRegex.match(links[2]["title"])
+ if(titleParts is not None):
+ titleParts = titleParts.groupdict()
+ ep["title"] += " - %sx%s" % (titleParts["s"],
titleParts["ep"])
+ if "title" in titleParts:
+ ep["title"] += " - " + titleParts["title"]
+ else:
+ #Fallback if title isn't an expected format...
+ ep["title"] = links[2]["title"]
+
+ #Image and url
+ ep["imgurl"] = __baseURL__ + div.parent.img["src"]
+ ep["url"] = __baseURL__ + links[0]["href"]
+
+ foundEps.append(ep)
+ else:
+ #Todo - Get show infos to add as some info label? Doesn"t seem
to be a good view
+ #that shows the info without having other fields left empty..
+ show = {}
+ show["title"] = links[0]["title"]
+ show["imgurl"] = __baseURL__ + div.parent.a.img["src"]
+ show["url"] = __baseURL__ + links[0]["href"]
+ foundShows.append(show)
+ except:
+ log("Issue with parsing show or ep div.")
+ log(div)
+ continue
#Add the found shows
if not __latestInSub__ or (__latestInSub__ and not showOnlyLatest) :
-----------------------------------------------------------------------
Summary of changes:
plugin.video.pennyarcadetv/addon.xml | 2 +-
plugin.video.pennyarcadetv/changelog.txt | 4 ++
plugin.video.pennyarcadetv/default.py | 59 +++++++++++++----------
plugin.video.xbmcflicks/addon.xml | 2 +-
plugin.video.xbmcflicks/changelog.txt | 3 +-
plugin.video.xbmcflicks/resources/lib/iqueue.py | 9 ++-
plugin.video.xbmcflicks/resources/lib/menu.py | 18 ++++----
7 files changed, 56 insertions(+), 41 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Enable your software for Intel(R) Active Management Technology to meet the
growing manageability and security demands of your customers. Businesses
are taking advantage of Intel(R) vPro (TM) technology - will your software
be a part of the solution? Download the Intel(R) Manageability Checker
today! http://p.sf.net/sfu/intel-dev2devmar
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
