The branch, dharma has been updated
via 022e6df891ab16d0f7a0c46b82d28a173f4fe631 (commit)
via 4e32f3d2459900d73476199ea4455c5c68b05ae7 (commit)
via 41934d17da5cff827e3665d93a721eb3eb50b06a (commit)
via 92e39fb35f8c6712b39425d994800e9ed0f3e66d (commit)
via 002b65486c0951b951cb881368b6e734b78fb3ad (commit)
from 7ca24498df82dab78cba394bb5a3d7cdc137cb80 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=022e6df891ab16d0f7a0c46b82d28a173f4fe631
commit 022e6df891ab16d0f7a0c46b82d28a173f4fe631
Author: spiff <[email protected]>
Date: Fri Jan 7 08:27:08 2011 +0100
[plugin.video.raiclick] initial version (1.1.0). thanks to Angeloxx
diff --git a/.gitignore b/.gitignore
index 778552a..38fa1a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@ plugin.video.gamestar/.gitignore
plugin.video.revision3/.git
plugin.video.classiccinema/.git
plugin.video.classiccinema/.gitignore
+plugin.video.raiclick/.git
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=4e32f3d2459900d73476199ea4455c5c68b05ae7
commit 4e32f3d2459900d73476199ea4455c5c68b05ae7
Author: spiff <[email protected]>
Date: Fri Jan 7 08:23:12 2011 +0100
[plugin.video.xbmcflicks] updated to version 1.0.12
diff --git a/plugin.video.xbmcflicks/addon.xml
b/plugin.video.xbmcflicks/addon.xml
index 0b17f6b..8f402ec 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.11"
+ version="1.0.12"
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 13fe17b..5e66b84 100644
--- a/plugin.video.xbmcflicks/changelog.txt
+++ b/plugin.video.xbmcflicks/changelog.txt
@@ -4,4 +4,5 @@
1.0.8 - changed icon for app, add'd diff for redundant text, added automatic
create of playercorefactory and advancedsettings based on os path info
1.0.9 - Added Disc Menu and Rental History
1.0.10 - fixed missing xml tag that was stopping the addon from loading
-1.0.11 - added support for Netflix.ca - user must enable option in settings
\ No newline at end of file
+1.0.11 - added support for Netflix.ca - user must enable option in settings
+1.0.12 - added additional icons for menu items, added option to get new list
with movie or just tv specified, added parental controls options for the Genre
Browse, currently used for Disc's (later for Instant watch)
diff --git a/plugin.video.xbmcflicks/icon.png b/plugin.video.xbmcflicks/icon.png
index 3efb6b9..ad8717d 100644
Binary files a/plugin.video.xbmcflicks/icon.png and
b/plugin.video.xbmcflicks/icon.png differ
diff --git a/plugin.video.xbmcflicks/resources/language/English/strings.xml
b/plugin.video.xbmcflicks/resources/language/English/strings.xml
index b907a09..5c5a7e3 100644
--- a/plugin.video.xbmcflicks/resources/language/English/strings.xml
+++ b/plugin.video.xbmcflicks/resources/language/English/strings.xml
@@ -35,6 +35,29 @@
<string id="30095">will output your user ID and Token in the log
file</string>
<string id="30099">Note: The options below will increase load time</string>
<!--- Parental Control Options -->
+ <string id="30150">Show Genre: Action & Adventure</string>
+ <string id="30151">Show Genre: Anime & Animation</string>
+ <string id="30152">Show Genre: Blu-ray</string>
+ <string id="30153">Show Genre: Children & Family</string>
+ <string id="30154">Show Genre: Classics</string>
+ <string id="30155">Show Genre: Comedy</string>
+ <string id="30156">Show Genre: Documentary</string>
+ <string id="30157">Show Genre: Drama</string>
+ <string id="30158">Show Genre: Faith & Spirituality</string>
+ <string id="30159">Show Genre: Foreign</string>
+ <string id="30160">Show Genre: Gay & Lesbian</string>
+ <string id="30161">Show Genre: Horror</string>
+ <string id="30162">Show Genre: Independent</string>
+ <string id="30163">Show Genre: Music & Musicals</string>
+ <string id="30164">Show Genre: Romance</string>
+ <string id="30165">Show Genre: Sci-Fi & Fantasy</string>
+ <string id="30166">Show Genre: Special Interest</string>
+ <string id="30167">Show Genre: Sports & Fitness</string>
+ <string id="30168">Show Genre: Television</string>
+ <string id="30169">Show Genre: Thrillers</string>
+ <string id="30170">empty</string>
+ <string id="30171">empty</string>
+
<string id="30200">Limit Rating to</string>
<string id="30201">No Limit</string>
<string id="30202">Unrated Mature</string>
diff --git a/plugin.video.xbmcflicks/resources/lib/iqueue.py
b/plugin.video.xbmcflicks/resources/lib/iqueue.py
index 145f798..17dee0a 100644
--- a/plugin.video.xbmcflicks/resources/lib/iqueue.py
+++ b/plugin.video.xbmcflicks/resources/lib/iqueue.py
@@ -68,12 +68,18 @@ def getAuth(netflix, verbose):
startBrowser(url)
else:
webbrowser.open(url)
+ print "browser open has completed"
#display click ok when finished adding xbmcflicks as authorized app
for your netflix account
dialog = xbmcgui.Dialog()
ok = dialog.ok("After you have linked xbmcflick in netflix.", "Click
OK after you finished the link in your browser window.")
+ print "The dialog was displayed, hopefully you read the text and
waited until you authorized it before clicking ok."
MY_USER['request']['key'] = tok.key
+ if(VERBOSE_USER_LOG):
+ print "user key set to: " + tok.key
MY_USER['request']['secret'] = tok.secret
+ if(VERBOSE_USER_LOG):
+ print "user secret set to: " + tok.secret
#now run the second part, getting the access token
tok = netflix.user.getAccessToken( MY_USER['request'] )
if(VERBOSE_USER_LOG):
@@ -425,7 +431,7 @@ def getMovieDataFromFeed(curX, curQueueItem, bIsEpisode,
netflix, instantAvail,
matchWebURL = re.search(r"u'web_page': u'(.*?)'", curQueueItem)
if matchWebURL:
- curX.WebURL = matchWebURL.group(1)
+ curX.WebURL = matchWebURL.group(1)
#shorttitle
matchTitleShort = re.search('[\'"]title[\'"]:
{.*?[\'"](title_)?short[\'"]: u{0,1}[\'"](.*?)[\'"].*?},', curQueueItem,
re.DOTALL | re.MULTILINE)
@@ -763,16 +769,75 @@ def parseRSSFeedItem(curQueueItem, curX):
print "error parsing data from RSS feed Item"
return curX
-def convertRSSFeed(tData, intLimit, DiscQueue=None):
+
+def parseFeedburnerItem(curQueueItem, curX):
+ try:
+ reobjCurItem = re.compile(r'<strong>(?P<title>.*?)</strong><br/><a
href="http://www\.netflix\.ca/[^"]*";><img
src="(?P<posterPrefix>http://cdn-0\.nflximg\.com/en_CA/boxshots/)small/\d{2,14}\.jpg"
/></a><br />(?P<summary>.*?)<a href="http://www\.netflix\.ca/[^"]*";>More
details</a> / <a
href="http://www\.netflix\.ca/WiPlayer\?movieid=(?P<id>\d{2,14})">Watch
now</a>', re.DOTALL | re.MULTILINE)
+ matchCurItem = reobjCurItem.search(curQueueItem)
+ if matchCurItem:
+ curX.Title = matchCurItem.group(1)
+ curX.TitleShort = matchCurItem.group(1)
+ curX.Synop = matchCurItem.group(3)
+ curX.WebURL = matchCurItem.group(4)
+ curX.ID = matchCurItem.group(5)
+ curX.Poster = matchCurItem.group(2) + POSTER_QUAL + "/" + curX.ID
+ ".jpg"
+ except:
+ print "error parsing data from Feedburner RSS feed Item"
+ return curX
+
+def convertFeedburnerFeed(tData, intLimit, DiscQueue=None):
#parse feed to curX object
curX = XInfo()
intCount = 0
- for match in re.finditer(r"(?sm)<item>(.*?)</item>", tData):
- intCount = intCount + 1
- #print str(intCount)
- if(intCount > int(intLimit)):
- return
+ for match in re.finditer(r"(?sm)<li.*?>(.*?)</li>", tData):
+ for matchItem in re.finditer(r"(?sm)<p>(.*?)</p>", match.group(1)):
+ intCount = intCount + 1
+ if(intCount > int(intLimit)):
+ return
+ curQueueItem = match.group(1)
+ parseFeedburnerItem(curQueueItem, curX)
+ if(curX.ID == ""):
+ print "fatal error: unable to parse ID in string " +
curQueueItem
+ else:
+ #add the link to the UI
+ if(DiscQueue):
+ addLinkDisc(curX.TitleShort,REAL_LINK_PATH + curX.ID +
'_disc.html', curX)
+ writeDiscLinkFile(curX.ID, curX.Title, curX.WebURL)
+ else:
+ addLink(curX.TitleShort,REAL_LINK_PATH + curX.ID +
'.html', curX)
+ #write the link file
+ writeLinkFile(curX.ID, curX.Title)
+
+def convertRSSFeed(tData, intLimit, DiscQueue=None, strArg=None):
+ #strArg (0 = all, 1 = movies, 2 = tv)
+ incMovie = False
+ incTV = False
+
+ if(strArg):
+ if(str(strArg) == "0"):
+ incMovie = True
+ incTV = True
+ if(DEBUG):
+ print "No filter"
+ elif(str(strArg) == "1"):
+ incMovie = True
+ incTV = False
+ if(DEBUG):
+ print "Filtering for Movies"
+ elif(str(strArg) == "2"):
+ incMovie = False
+ incTV = True
+ if(DEBUG):
+ print "Filtering for TV"
+ else:
+ incMovie = True
+ incTV = True
+
+ #parse feed to curX object
+ curX = XInfo()
+ intCount = 0
+ for match in re.finditer(r"(?sm)<item>(.*?)</item>", tData):
curQueueItem = match.group(1)
parseRSSFeedItem(curQueueItem, curX)
@@ -780,14 +845,38 @@ def convertRSSFeed(tData, intLimit, DiscQueue=None):
print "fatal error: unable to parse ID in string " + curQueueItem
exit
- #add the link to the UI
- if(DiscQueue):
- addLinkDisc(curX.TitleShort,REAL_LINK_PATH + curX.ID +
'_disc.html', curX)
- writeDiscLinkFile(curX.ID, curX.Title, curX.WebURL)
+ isMovie = False
+ isTV = False
+ skip = True
+ if re.search(r"(Season|Vol\.|: Chapter)", curX.Title, re.DOTALL |
re.MULTILINE):
+ isTV = True
else:
- addLink(curX.TitleShort,REAL_LINK_PATH + curX.ID + '.html', curX)
- #write the link file
- writeLinkFile(curX.ID, curX.Title)
+ isMovie = True
+
+ if (isMovie & incMovie):
+ intCount = intCount + 1
+ if (DEBUG):
+ print "triggered count on movies limiter:" + str(intCount) + "
of " + str(intLimit)
+ skip = False
+ elif (isTV & incTV):
+ intCount = intCount + 1
+ if (DEBUG):
+ print "triggered count on tv limiter:" + str(intCount) + " of
" + str(intLimit)
+ skip = False
+ #print str(intCount)
+ if(intCount > int(intLimit)):
+ return
+
+ if(not skip):
+ #add the link to the UI
+ if(DiscQueue):
+ addLinkDisc(curX.TitleShort,REAL_LINK_PATH + curX.ID +
'_disc.html', curX)
+ writeDiscLinkFile(curX.ID, curX.Title, curX.WebURL)
+ else:
+ addLink(curX.TitleShort,REAL_LINK_PATH + curX.ID + '.html',
curX)
+ #write the link file
+ writeLinkFile(curX.ID, curX.Title)
+
def getUserRentalHistory(netflix, user, strHistoryType, displayWhat=None):
print "*** What's the rental history? ***"
@@ -950,22 +1039,42 @@ def getRecommendedQueue():
xbmcplugin.setContent(int(sys.argv[1]),'Movies')
xbmcplugin.endOfDirectory(int(sys.argv[1]))
-def getNewToWatchInstant():
+def getNewToWatchInstantCA(strArg):
+ initApp()
+ if(not user):
+ exit
+ curUrl = "http://www.netflix.ca/NewWatchInstantlyRSS";
+ convertRSSFeed(getUrlString(curUrl), 500, None, strArg)
+ time.sleep(1)
+ xbmcplugin.setContent(int(sys.argv[1]),'Movies')
+ xbmcplugin.endOfDirectory(int(sys.argv[1]))
+
+def getNewToWatchInstantCATopX(strArg):
+ initApp()
+ if(not user):
+ exit
+ curUrl = "http://www.netflix.ca/NewWatchInstantlyRSS";
+ convertRSSFeed(getUrlString(curUrl), 25, None, strArg)
+ time.sleep(1)
+ xbmcplugin.setContent(int(sys.argv[1]),'Movies')
+ xbmcplugin.endOfDirectory(int(sys.argv[1]))
+
+def getNewToWatchInstant(strArg):
initApp()
if(not user):
exit
curUrl = "http://www.netflix.com/NewWatchInstantlyRSS";
- convertRSSFeed(getUrlString(curUrl), 500)
+ convertRSSFeed(getUrlString(curUrl), 500, None, strArg)
time.sleep(1)
xbmcplugin.setContent(int(sys.argv[1]),'Movies')
xbmcplugin.endOfDirectory(int(sys.argv[1]))
-def getNewToWatchInstantTopX():
+def getNewToWatchInstantTopX(strArg):
initApp()
if(not user):
exit
curUrl = "http://www.netflix.com/NewWatchInstantlyRSS";
- convertRSSFeed(getUrlString(curUrl), 25)
+ convertRSSFeed(getUrlString(curUrl), 25, None, strArg)
time.sleep(1)
xbmcplugin.setContent(int(sys.argv[1]),'Movies')
xbmcplugin.endOfDirectory(int(sys.argv[1]))
diff --git a/plugin.video.xbmcflicks/resources/lib/menu.py
b/plugin.video.xbmcflicks/resources/lib/menu.py
index 4f631f3..476cde6 100644
--- a/plugin.video.xbmcflicks/resources/lib/menu.py
+++ b/plugin.video.xbmcflicks/resources/lib/menu.py
@@ -11,8 +11,12 @@ MODE1a = 11
MODE1b = 12
MODE2 = 20
MODE3 = 30
+MODE3a = 31
+MODE3b = 32
MODE4 = 40
MODE5 = 50
+MODE5a = 51
+MODE5b = 52
MODE6 = 60
MODE6a = 61
MODE6b = 62
@@ -94,8 +98,12 @@ SUBMENU1a = "Instant Queue: Movies"
SUBMENU1b = "Instant Queue: TV"
SUBMENU2 = "Recommended"
SUBMENU3 = "All New Arrivals"
+SUBMENU3a = "All New Arrivals: Movies"
+SUBMENU3b = "All New Arrivals: TV"
SUBMENU4 = "Search..."
SUBMENU5 = "Top 25 New Arrivals"
+SUBMENU5a = "Top 25 New Arrivals: Movies"
+SUBMENU5b = "Top 25 New Arrivals: TV"
SUBMENU6 = "By Genre"
SUBMENU6a = "Action & Adventure"
SUBMENU6b = "Children & Family"
@@ -175,6 +183,48 @@ handle = int(sys.argv[1])
# settings
global IN_CANADA
IN_CANADA = getUserSettingCaUser(handle)
+global SGACTION
+global SGANIME
+global SGBLURAY
+global SGCHILDREN
+global SGCLASSICS
+global SGCOMEDY
+global SGDOCUMENTARY
+global SGDRAMA
+global SGFAITH
+global SGFOREIGN
+global SGGAY
+global SGHORROR
+global SGINDIE
+global SGMUSIC
+global SGROMANCE
+global SGSCIFI
+global SGSPECIALINTEREST
+global SGSPORTS
+global SGTV
+global SGTHRILLERS
+
+SGACTION = getUserSettingGenreDisplay(handle, "sgAction")
+SGANIME = getUserSettingGenreDisplay(handle, "sgAnime")
+SGBLURAY = getUserSettingGenreDisplay(handle, "sgBluray")
+SGCHILDREN = getUserSettingGenreDisplay(handle, "sgChildren")
+SGCLASSICS = getUserSettingGenreDisplay(handle, "sgClassics")
+SGCOMEDY = getUserSettingGenreDisplay(handle, "sgComedy")
+SGDOCUMENTARY = getUserSettingGenreDisplay(handle, "sgDocumentary")
+SGDRAMA = getUserSettingGenreDisplay(handle, "sgDrama")
+SGFAITH = getUserSettingGenreDisplay(handle, "sgFaith")
+SGFOREIGN = getUserSettingGenreDisplay(handle, "sgForeign")
+SGGAY = getUserSettingGenreDisplay(handle, "sgGay")
+SGHORROR = getUserSettingGenreDisplay(handle, "sgHorror")
+SGINDIE = getUserSettingGenreDisplay(handle, "sgIndie")
+SGMUSIC = getUserSettingGenreDisplay(handle, "sgMusic")
+SGROMANCE = getUserSettingGenreDisplay(handle, "sgRomance")
+SGSCIFI = getUserSettingGenreDisplay(handle, "sgSciFi")
+SGSPECIALINTEREST = getUserSettingGenreDisplay(handle, "sgSpecialInterest")
+SGSPORTS = getUserSettingGenreDisplay(handle, "sgSports")
+SGTV = getUserSettingGenreDisplay(handle, "sgTV")
+SGTHRILLERS = getUserSettingGenreDisplay(handle, "sgThrillers")
+
# utility functions
def parameters_string_to_dict(parameters):
@@ -200,43 +250,49 @@ def addDirectoryItem(name, isFolder=True, parameters={},
thumbnail=None):
# UI builder functions
def show_root_menu():
- addDirectoryItem(name=SUBMENU0iw, parameters={ PARAMETER_KEY_MODE:MODE0iw
}, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/instant.png")
- addDirectoryItem(name=SUBMENU0d, parameters={ PARAMETER_KEY_MODE:MODE0d },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc.png")
- addDirectoryItem(name=SUBMENUR, parameters={ PARAMETER_KEY_MODE:MODER },
isFolder=True)
+ addDirectoryItem(name=SUBMENU0iw, parameters={ PARAMETER_KEY_MODE:MODE0iw
}, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/instant_watch_main.png")
+ if(not IN_CANADA):
+ addDirectoryItem(name=SUBMENU0d, parameters={ PARAMETER_KEY_MODE:MODE0d
}, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_by_mail.png")
+ addDirectoryItem(name=SUBMENUR, parameters={ PARAMETER_KEY_MODE:MODER },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/rental_history.png")
xbmcplugin.endOfDirectory(handle=handle, succeeded=True)
def show_instant_menu():
- addDirectoryItem(name=SUBMENU1, parameters={ PARAMETER_KEY_MODE:MODE1 },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/iqueue_all.png")
- addDirectoryItem(name=SUBMENU1a, parameters={ PARAMETER_KEY_MODE:MODE1a },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/iqueue_movies.png")
- addDirectoryItem(name=SUBMENU1b, parameters={ PARAMETER_KEY_MODE:MODE1b },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/iqueue_tv.png")
-
- addDirectoryItem(name=SUBMENU2, parameters={ PARAMETER_KEY_MODE:MODE2 },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/recog.png")
-
if(not IN_CANADA):
- addDirectoryItem(name=SUBMENU5, parameters={ PARAMETER_KEY_MODE:MODE5 },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/new_top25.png")
- addDirectoryItem(name=SUBMENU3, parameters={ PARAMETER_KEY_MODE:MODE3 },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/new_all.png")
-
- addDirectoryItem(name=SUBMENU4, parameters={ PARAMETER_KEY_MODE:MODE4 },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/search.png")
- #addDirectoryItem(name=SUBMENU6, parameters={ PARAMETER_KEY_MODE:MODE6 },
isFolder=True)
+ addDirectoryItem(name=SUBMENU1, parameters={ PARAMETER_KEY_MODE:MODE1 },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/instant_queue_all.png")
+ addDirectoryItem(name=SUBMENU1a, parameters={ PARAMETER_KEY_MODE:MODE1a
}, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/instant_queue_movies.png")
+ addDirectoryItem(name=SUBMENU1b, parameters={ PARAMETER_KEY_MODE:MODE1b
}, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/instant_queue_tv.png")
+
+ addDirectoryItem(name=SUBMENU2, parameters={ PARAMETER_KEY_MODE:MODE2 },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/instant_watch_recommended.png")
+
+ addDirectoryItem(name=SUBMENU5, parameters={ PARAMETER_KEY_MODE:MODE5 },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/instant_new_top25.png")
+ addDirectoryItem(name=SUBMENU5a, parameters={ PARAMETER_KEY_MODE:MODE5a },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/instant_new_top25_movies.png")
+ addDirectoryItem(name=SUBMENU5b, parameters={ PARAMETER_KEY_MODE:MODE5b },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/instant_new_top25_tv.png")
+
+ addDirectoryItem(name=SUBMENU3, parameters={ PARAMETER_KEY_MODE:MODE3 },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/instant_new_all.png")
+ addDirectoryItem(name=SUBMENU3a, parameters={ PARAMETER_KEY_MODE:MODE3a },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/instant_new_all_movies.png")
+ addDirectoryItem(name=SUBMENU3b, parameters={ PARAMETER_KEY_MODE:MODE3b },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/instant_new_all_tv.png")
+
+ addDirectoryItem(name=SUBMENU4, parameters={ PARAMETER_KEY_MODE:MODE4 },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/instant_search.png")
+ #addDirectoryItem(name=SUBMENU6, parameters={ PARAMETER_KEY_MODE:MODE6 },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/instant_watch_top25s.png")
xbmcplugin.endOfDirectory(handle=handle, succeeded=True)
def show_disc_menu():
- addDirectoryItem(name=SUBMENUD1, parameters={ PARAMETER_KEY_MODE:MODED1 },
isFolder=True)
- addDirectoryItem(name=SUBMENUD1m, parameters={ PARAMETER_KEY_MODE:MODED1m
}, isFolder=True)
- addDirectoryItem(name=SUBMENUD1t, parameters={ PARAMETER_KEY_MODE:MODED1t
}, isFolder=True)
+ addDirectoryItem(name=SUBMENUD1, parameters={ PARAMETER_KEY_MODE:MODED1 },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_queue_all.png")
+ addDirectoryItem(name=SUBMENUD1m, parameters={ PARAMETER_KEY_MODE:MODED1m
}, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_queue_movies.png")
+ addDirectoryItem(name=SUBMENUD1t, parameters={ PARAMETER_KEY_MODE:MODED1t
}, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_queue_tv.png")
if(not IN_CANADA):
- addDirectoryItem(name=SUBMENUD7, parameters={ PARAMETER_KEY_MODE:MODED7
}, isFolder=True)
+ addDirectoryItem(name=SUBMENUD7, parameters={ PARAMETER_KEY_MODE:MODED7
}, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_top25_bygenre.png")
- addDirectoryItem(name=SUBMENUD2, parameters={ PARAMETER_KEY_MODE:MODED2 },
isFolder=True)
- addDirectoryItem(name=SUBMENUD3, parameters={ PARAMETER_KEY_MODE:MODED3 },
isFolder=True)
+ addDirectoryItem(name=SUBMENUD2, parameters={ PARAMETER_KEY_MODE:MODED2 },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_search.png")
+ addDirectoryItem(name=SUBMENUD3, parameters={ PARAMETER_KEY_MODE:MODED3 },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/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)
- addDirectoryItem(name=SUBMENUR2, parameters={ PARAMETER_KEY_MODE:MODER2 },
isFolder=True)
- addDirectoryItem(name=SUBMENUR3, parameters={ PARAMETER_KEY_MODE:MODER3 },
isFolder=True)
+ addDirectoryItem(name=SUBMENUR1, parameters={ PARAMETER_KEY_MODE:MODER1 },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/rental_history_shipped.png")
+ addDirectoryItem(name=SUBMENUR2, parameters={ PARAMETER_KEY_MODE:MODER2 },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/rental_history_returned.png")
+ addDirectoryItem(name=SUBMENUR3, parameters={ PARAMETER_KEY_MODE:MODER3 },
isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/rental_history_watched.png")
xbmcplugin.endOfDirectory(handle=handle, succeeded=True)
@@ -296,26 +352,46 @@ def show_SUBMENU7():
def show_SUBMENUD7():
#add in the disc genre folders for the Top 25 items
- addDirectoryItem(name=SUBMENUD7a, parameters={ PARAMETER_KEY_MODE:MODED7a
}, isFolder=True)
- addDirectoryItem(name=SUBMENUD7b, parameters={ PARAMETER_KEY_MODE:MODED7b
}, isFolder=True)
- addDirectoryItem(name=SUBMENUD7c, parameters={ PARAMETER_KEY_MODE:MODED7c
}, isFolder=True)
- addDirectoryItem(name=SUBMENUD7d, parameters={ PARAMETER_KEY_MODE:MODED7d
}, isFolder=True)
- addDirectoryItem(name=SUBMENUD7e, parameters={ PARAMETER_KEY_MODE:MODED7e
}, isFolder=True)
- addDirectoryItem(name=SUBMENUD7f, parameters={ PARAMETER_KEY_MODE:MODED7f
}, isFolder=True)
- addDirectoryItem(name=SUBMENUD7g, parameters={ PARAMETER_KEY_MODE:MODED7g
}, isFolder=True)
- addDirectoryItem(name=SUBMENUD7h, parameters={ PARAMETER_KEY_MODE:MODED7h
}, isFolder=True)
- addDirectoryItem(name=SUBMENUD7i, parameters={ PARAMETER_KEY_MODE:MODED7i
}, isFolder=True)
- addDirectoryItem(name=SUBMENUD7j, parameters={ PARAMETER_KEY_MODE:MODED7j
}, isFolder=True)
- addDirectoryItem(name=SUBMENUD7k, parameters={ PARAMETER_KEY_MODE:MODED7k
}, isFolder=True)
- addDirectoryItem(name=SUBMENUD7l, parameters={ PARAMETER_KEY_MODE:MODED7l
}, isFolder=True)
- addDirectoryItem(name=SUBMENUD7m, parameters={ PARAMETER_KEY_MODE:MODED7m
}, isFolder=True)
- addDirectoryItem(name=SUBMENUD7n, parameters={ PARAMETER_KEY_MODE:MODED7n
}, isFolder=True)
- addDirectoryItem(name=SUBMENUD7o, parameters={ PARAMETER_KEY_MODE:MODED7o
}, isFolder=True)
- addDirectoryItem(name=SUBMENUD7p, parameters={ PARAMETER_KEY_MODE:MODED7p
}, isFolder=True)
- addDirectoryItem(name=SUBMENUD7q, parameters={ PARAMETER_KEY_MODE:MODED7q
}, isFolder=True)
- addDirectoryItem(name=SUBMENUD7r, parameters={ PARAMETER_KEY_MODE:MODED7r
}, isFolder=True)
- addDirectoryItem(name=SUBMENUD7s, parameters={ PARAMETER_KEY_MODE:MODED7s
}, isFolder=True)
- addDirectoryItem(name=SUBMENUD7t, parameters={ PARAMETER_KEY_MODE:MODED7t
}, isFolder=True)
+ if SGACTION:
+ addDirectoryItem(name=SUBMENUD7a, parameters={
PARAMETER_KEY_MODE:MODED7a }, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_top25_action2.png")
+ if SGANIME:
+ addDirectoryItem(name=SUBMENUD7b, parameters={
PARAMETER_KEY_MODE:MODED7b }, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_top25_anime2.png")
+ if SGBLURAY:
+ addDirectoryItem(name=SUBMENUD7c, parameters={
PARAMETER_KEY_MODE:MODED7c }, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_top25_bluray2.png")
+ if SGCHILDREN:
+ addDirectoryItem(name=SUBMENUD7d, parameters={
PARAMETER_KEY_MODE:MODED7d }, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_top25_children2.png")
+ if SGCLASSICS:
+ addDirectoryItem(name=SUBMENUD7e, parameters={
PARAMETER_KEY_MODE:MODED7e }, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_top25_classics2.png")
+ if SGCOMEDY:
+ addDirectoryItem(name=SUBMENUD7f, parameters={
PARAMETER_KEY_MODE:MODED7f }, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_top25_comedy2.png")
+ if SGDOCUMENTARY:
+ addDirectoryItem(name=SUBMENUD7g, parameters={
PARAMETER_KEY_MODE:MODED7g }, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_top25_documentary2.png")
+ if SGDRAMA:
+ addDirectoryItem(name=SUBMENUD7h, parameters={
PARAMETER_KEY_MODE:MODED7h }, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_top25_drama2.png")
+ if SGFAITH:
+ addDirectoryItem(name=SUBMENUD7i, parameters={
PARAMETER_KEY_MODE:MODED7i }, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_top25_faith2.png")
+ if SGFOREIGN:
+ addDirectoryItem(name=SUBMENUD7j, parameters={
PARAMETER_KEY_MODE:MODED7j }, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_top25_foreign2.png")
+ if SGGAY:
+ addDirectoryItem(name=SUBMENUD7k, parameters={
PARAMETER_KEY_MODE:MODED7k }, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_top25_lesbian2.png")
+ if SGHORROR:
+ addDirectoryItem(name=SUBMENUD7l, parameters={
PARAMETER_KEY_MODE:MODED7l }, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_top25_horror2.png")
+ if SGINDIE:
+ addDirectoryItem(name=SUBMENUD7m, parameters={
PARAMETER_KEY_MODE:MODED7m }, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_top25_independent2.png")
+ if SGMUSIC:
+ addDirectoryItem(name=SUBMENUD7n, parameters={
PARAMETER_KEY_MODE:MODED7n }, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_top25_music2.png")
+ if SGROMANCE:
+ addDirectoryItem(name=SUBMENUD7o, parameters={
PARAMETER_KEY_MODE:MODED7o }, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_top25_romance2.png")
+ if SGSCIFI:
+ addDirectoryItem(name=SUBMENUD7p, parameters={
PARAMETER_KEY_MODE:MODED7p }, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_top25_scifi2.png")
+ if SGSPECIALINTEREST:
+ addDirectoryItem(name=SUBMENUD7q, parameters={
PARAMETER_KEY_MODE:MODED7q }, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_top25_special_interest2.png")
+ if SGSPORTS:
+ addDirectoryItem(name=SUBMENUD7r, parameters={
PARAMETER_KEY_MODE:MODED7r }, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_top25_sports2.png")
+ if SGTV:
+ addDirectoryItem(name=SUBMENUD7s, parameters={
PARAMETER_KEY_MODE:MODED7s }, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_top25_television2.png")
+ if SGTHRILLERS:
+ addDirectoryItem(name=SUBMENUD7t, parameters={
PARAMETER_KEY_MODE:MODED7t }, isFolder=True,
thumbnail="special://home/addons/plugin.video.xbmcflicks/resources/disc_top25_thrillers2.png")
xbmcplugin.endOfDirectory(handle=handle, succeeded=True)
# parameter values
@@ -342,9 +418,24 @@ elif mode == MODE1a:
elif mode == MODE1b:
getInstantQueue(2)
elif mode == MODE2:
- getRecommendedQueue()
+ getRecommendedQueue()
+
elif mode == MODE3:
- getNewToWatchInstant()
+ if(not IN_CANADA):
+ getNewToWatchInstant("0")
+ else:
+ getNewToWatchInstantCA("0")
+elif mode == MODE3a:
+ if(not IN_CANADA):
+ getNewToWatchInstant("1")
+ else:
+ getNewToWatchInstantCA("1")
+elif mode == MODE3b:
+ if(not IN_CANADA):
+ getNewToWatchInstant("2")
+ else:
+ getNewToWatchInstantCA("2")
+
elif mode == MODE4:
keyboard = xbmc.Keyboard()
keyboard.doModal()
@@ -354,9 +445,23 @@ elif mode == MODE4:
doSearch(arg, "instant", True)
else:
print "user canceled"
-elif mode == MODE5:
- getNewToWatchInstantTopX()
+elif mode == MODE5:
+ if(not IN_CANADA):
+ getNewToWatchInstantTopX("0")
+ else:
+ getNewToWatchInstantCATopX("0")
+elif mode == MODE5a:
+ if(not IN_CANADA):
+ getNewToWatchInstantTopX("1")
+ else:
+ getNewToWatchInstantCATopX("1")
+elif mode == MODE5b:
+ if(not IN_CANADA):
+ getNewToWatchInstantTopX("2")
+ else:
+ getNewToWatchInstantCATopX("2")
+
elif mode == MODE6:
ok = show_SUBMENU6()
elif mode == MODE6a:
diff --git a/plugin.video.xbmcflicks/resources/lib/oauth.py
b/plugin.video.xbmcflicks/resources/lib/oauth.py
index 4fb4033..1e68f02 100644
--- a/plugin.video.xbmcflicks/resources/lib/oauth.py
+++ b/plugin.video.xbmcflicks/resources/lib/oauth.py
@@ -29,7 +29,7 @@ import random
import urlparse
import hmac
import binascii
-
+import re
VERSION = '1.0'
HTTP_METHOD = 'GET'
@@ -138,6 +138,12 @@ class OAuthToken(object):
""" Returns a token from something like:
oauth_token_secret=xxx&oauth_token=xxx
"""
+ strResult = str(s)
+ if re.search(r"(invalid|error|date|time)", strResult, re.DOTALL |
re.IGNORECASE | re.MULTILINE):
+ print "Token result was: " + str(strResult)
+ print "If the timestamp shows invalid, your computers date/time is
off, sync it to an NTP server or fix it by setting the correct values"
+ else:
+ print "Token did not contain any errors"
params = cgi.parse_qs(s, keep_blank_values=False)
key = params['oauth_token'][0]
secret = params['oauth_token_secret'][0]
diff --git a/plugin.video.xbmcflicks/resources/lib/settings.py
b/plugin.video.xbmcflicks/resources/lib/settings.py
index 6cc3973..f624e42 100644
--- a/plugin.video.xbmcflicks/resources/lib/settings.py
+++ b/plugin.video.xbmcflicks/resources/lib/settings.py
@@ -121,6 +121,15 @@ def getUserSettingRatingLimit(arg):
v = "10"
return v
+def getUserSettingGenreDisplay(arg, sgGenre):
+ vui = xbmcplugin.getSetting(arg, str(sgGenre))
+ v = False
+ if(vui == "0"):
+ v = True
+ if(vui == "1"):
+ v = False
+ return v
+
def getUserSettingMaxIQRetreve(arg):
maxr = xbmcplugin.getSetting(arg,'maxIqR')
v = ""
diff --git a/plugin.video.xbmcflicks/resources/settings.xml
b/plugin.video.xbmcflicks/resources/settings.xml
index 1522e40..5e3b182 100644
--- a/plugin.video.xbmcflicks/resources/settings.xml
+++ b/plugin.video.xbmcflicks/resources/settings.xml
@@ -12,6 +12,26 @@
<category label="Parental Control's">
<setting id="mrLimit" type="enum"
lvalues="30201|30202|30203|30204|30205|30206|30207|30208|30209|30210|30211|30212|30213"
label="30200" default="0"/>
<setting id="showRatingInTitle" type="enum" lvalues="30016|30017"
label="30220" default="0"/>
+ <setting id="sgAction" type="enum" lvalues="30016|30017" label="30150"
default="0"/>
+ <setting id="sgAnime" type="enum" lvalues="30016|30017" label="30151"
default="0"/>
+ <setting id="sgBluray" type="enum" lvalues="30016|30017" label="30152"
default="0"/>
+ <setting id="sgChildren" type="enum" lvalues="30016|30017" label="30153"
default="0"/>
+ <setting id="sgClassics" type="enum" lvalues="30016|30017" label="30154"
default="0"/>
+ <setting id="sgComedy" type="enum" lvalues="30016|30017" label="30155"
default="0"/>
+ <setting id="sgDocumentary" type="enum" lvalues="30016|30017" label="30156"
default="0"/>
+ <setting id="sgDrama" type="enum" lvalues="30016|30017" label="30157"
default="0"/>
+ <setting id="sgFaith" type="enum" lvalues="30016|30017" label="30158"
default="0"/>
+ <setting id="sgForeign" type="enum" lvalues="30016|30017" label="30159"
default="0"/>
+ <setting id="sgGay" type="enum" lvalues="30016|30017" label="30160"
default="1"/>
+ <setting id="sgHorror" type="enum" lvalues="30016|30017" label="30161"
default="0"/>
+ <setting id="sgIndie" type="enum" lvalues="30016|30017" label="30162"
default="0"/>
+ <setting id="sgMusic" type="enum" lvalues="30016|30017" label="30163"
default="0"/>
+ <setting id="sgRomance" type="enum" lvalues="30016|30017" label="30164"
default="0"/>
+ <setting id="sgSciFi" type="enum" lvalues="30016|30017" label="30165"
default="0"/>
+ <setting id="sgSpecialInterest" type="enum" lvalues="30016|30017"
label="30166" default="0"/>
+ <setting id="sgSports" type="enum" lvalues="30016|30017" label="30167"
default="0"/>
+ <setting id="sgTV" type="enum" lvalues="30016|30017" label="30168"
default="0"/>
+ <setting id="sgThrillers" type="enum" lvalues="30016|30017" label="30169"
default="0"/>
</category>
<category label="Miscellaneous">
<setting id="useAltPlayer" type="enum" lvalues="30017" label="30029"
default="1"/>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=41934d17da5cff827e3665d93a721eb3eb50b06a
commit 41934d17da5cff827e3665d93a721eb3eb50b06a
Author: spiff <[email protected]>
Date: Fri Jan 7 08:20:15 2011 +0100
[plugin.video.vega] updated to version 1.0.1
diff --git a/plugin.video.vega/README b/plugin.video.vega/README
index 07b1c72..1473f76 100644
--- a/plugin.video.vega/README
+++ b/plugin.video.vega/README
@@ -1 +1 @@
-XBMC plugin that plays concerts from the music venue VEGA in Copenhagen,
Denmark.
\ No newline at end of file
+Plays recorded concerts from the music venue VEGA in Copenhagen, Denmark.
diff --git a/plugin.video.vega/addon.xml b/plugin.video.vega/addon.xml
index f3f90ce..2345212 100644
--- a/plugin.video.vega/addon.xml
+++ b/plugin.video.vega/addon.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon id="plugin.video.vega"
- version="1.0.0"
+ version="1.0.1"
name="VEGA Concerts"
provider-name="Jeppe Toustrup">
<requires/>
@@ -10,7 +10,7 @@
</extension>
<extension point="xbmc.addon.metadata">
<summary>VEGA concert player</summary>
- <description>Plays concerts from the music venue VEGA in
Copenhagen, Denmark. Check www.vega.dk for concert listings.</description>
- <platform>all</platform>
+ <description>Plays recorded concerts from the music venue VEGA
in Copenhagen, Denmark. Check www.vega.dk for concert listings.</description>
+ <platform>osx linux</platform>
</extension>
</addon>
diff --git a/plugin.video.vega/changelog.txt b/plugin.video.vega/changelog.txt
index 3c65d50..4991602 100644
--- a/plugin.video.vega/changelog.txt
+++ b/plugin.video.vega/changelog.txt
@@ -1,2 +1,6 @@
+[B]1.0.1[/B]
+- Added note about this plugin is not working on Windows machines on Dharma
+- Corrected some meta data for the plugin which was wrong
+
[B]1.0.0[/B]
-- Initial version
\ No newline at end of file
+- Initial version
diff --git a/plugin.video.vega/default.py b/plugin.video.vega/default.py
index fc1a616..4405021 100644
--- a/plugin.video.vega/default.py
+++ b/plugin.video.vega/default.py
@@ -21,10 +21,9 @@ from resources.lib import getter, printer
# Plugin constants
__plugin__ = 'VEGA Concerts'
-__author__ = 'Tenzer'
-__url__ = 'http://code.google.com/p/xbmc-addons/'
-__svn_url__ =
'http://xbmc-addons.googlecode.com/svn/trunk/plugins/video/VEGA%20Concerts'
-__version__ = '1.0.0'
+__author__ = 'Jeppe Toustrup'
+__url__ = 'http://github.com/Tenzer/plugin.video.vega/'
+__version__ = '1.0.1'
if(sys.argv[2].startswith('?concert=')):
@@ -40,4 +39,4 @@ elif(sys.argv[2].startswith('?track=')):
else:
# Print the concert listing
concerts = getter.getConcerts()
- printer.printConcerts(concerts)
\ No newline at end of file
+ printer.printConcerts(concerts)
diff --git a/plugin.video.vega/resources/language/English/strings.xml
b/plugin.video.vega/resources/language/English/strings.xml
index 3b61bdc..710cd40 100644
--- a/plugin.video.vega/resources/language/English/strings.xml
+++ b/plugin.video.vega/resources/language/English/strings.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<string id="30000">Caching time</string>
-</strings>
\ No newline at end of file
+</strings>
diff --git a/plugin.video.vega/resources/settings.xml
b/plugin.video.vega/resources/settings.xml
index ec9a834..bfdcf50 100644
--- a/plugin.video.vega/resources/settings.xml
+++ b/plugin.video.vega/resources/settings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
<setting id="cache_time" type="enum" values="12 hours|1 day|2 days|1
week" label="30000" default="1" />
-</settings>
\ No newline at end of file
+</settings>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=92e39fb35f8c6712b39425d994800e9ed0f3e66d
commit 92e39fb35f8c6712b39425d994800e9ed0f3e66d
Author: spiff <[email protected]>
Date: Fri Jan 7 08:16:20 2011 +0100
[plugin.video.vimeo] updated to version 1.0.2
diff --git a/plugin.video.vimeo/VimeoCore.py b/plugin.video.vimeo/VimeoCore.py
index ef398a2..81bd8e2 100755
--- a/plugin.video.vimeo/VimeoCore.py
+++ b/plugin.video.vimeo/VimeoCore.py
@@ -113,7 +113,6 @@ class VimeoCore(object):
con.close()
# part 2: now that we have a token we can do the login
procedure while appending token to prove we're legit.
-
start = page1.find('<input type="hidden" id="xsrft"
class="xsrft" name="token" value="') + len('<input type="hidden" id="xsrft"
class="xsrft" name="token" value="')
xsrft = page1[start:page1.find('"', start)]
@@ -151,9 +150,19 @@ class VimeoCore(object):
# <div class="inner">
# The email
address and password you entered do not match. </div>
#</div>
-
- start = page3.find("/user") + len("/user")
- userid = page3[start:page3.find("/", start)]
+ if (self.__dbg__):
+ print "Cookie jar contents: " + repr(cj)
+ userid = ""
+
+ for cookie in cj:
+ if cookie.name == "uid":
+ uid = urllib.unquote_plus(cookie.value)
+ userid = uid.split("|")[0]
+
+ if not userid:
+ if self.__dbg__:
+ print self.__plugin__ +
"login_get_verifier no userid in cookie jar login failed"
+ return ( self.__language__(30606), 303 )
if (self.__dbg__):
print self.__plugin__ + " setting userid: " +
repr(userid)
@@ -184,7 +193,7 @@ class VimeoCore(object):
if self.__settings__.getSetting("accept") != "0":
if self.__dbg__:
print self.__plugin__ + "
login_get_verifier accept disabled"
- return ( self.__language__(30606), 303 )
+ return ( self.__language__(30606), 303 )
data = urllib.urlencode({'token': login_token,
'oauth_token': login_oauth_token,
diff --git a/plugin.video.vimeo/addon.xml b/plugin.video.vimeo/addon.xml
index e71a841..254597b 100644
--- a/plugin.video.vimeo/addon.xml
+++ b/plugin.video.vimeo/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.vimeo"
name="Vimeo"
- version="1.0.1"
+ version="1.0.2"
provider-name="TheCollective">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.video.vimeo/changelog.txt b/plugin.video.vimeo/changelog.txt
index da9c6c0..9b47c59 100644
--- a/plugin.video.vimeo/changelog.txt
+++ b/plugin.video.vimeo/changelog.txt
@@ -2,6 +2,9 @@
- [XBMC] Thumbnails sometimes turns into folders.
- XBMC has Excessive Memory use after running the plugin for prolonged periods
of time
+[B]Version 1.0.2[/B]
+- Fixed login issues for users with non numeric user id's
+
[B]Version 1.0.1[/B]
- Fixed broken playback of SD videos when HD was selected.
diff --git a/plugin.video.vimeo/default.py b/plugin.video.vimeo/default.py
index a29b354..fc77184 100644
--- a/plugin.video.vimeo/default.py
+++ b/plugin.video.vimeo/default.py
@@ -3,7 +3,7 @@ import sys, xbmc, xbmcaddon
REMOTE_DBG = False
# plugin constants
-__version__ = "1.0.0"
+__version__ = "1.0.2"
__plugin__ = "Vimeo-" + __version__
__author__ = "TheCollective"
__url__ = "www.xbmc.com"
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=002b65486c0951b951cb881368b6e734b78fb3ad
commit 002b65486c0951b951cb881368b6e734b78fb3ad
Author: spiff <[email protected]>
Date: Fri Jan 7 08:14:25 2011 +0100
[plugin.video.classiccinema] initial version (0.7.1). thanks to jbel
diff --git a/.gitignore b/.gitignore
index 8ff4498..778552a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,5 @@ plugin.video.xbmcflicks/.git
plugin.video.gamestar/.git
plugin.video.gamestar/.gitignore
plugin.video.revision3/.git
+plugin.video.classiccinema/.git
+plugin.video.classiccinema/.gitignore
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 3 +
.../LICENSE.txt | 0
plugin.video.classiccinema/README.markdown | 43 ++++
plugin.video.classiccinema/addon.py | 194 ++++++++++++++++++
plugin.video.classiccinema/addon.xml | 16 ++
plugin.video.classiccinema/icon.png | Bin 0 -> 76120 bytes
.../resources}/__init__.py | 0
.../resources/language/English/strings.xml | 8 +
.../resources/lib}/__init__.py | 0
.../resources/lib/googlevideo.py | 47 +++++
.../resources/lib/xbmccommon.py | 216 ++++++++++++++++++++
.../resources/lib/xbmcvideoplugin.py | 176 ++++++++++++++++
.../LICENSE.txt | 0
.../__init__.py => plugin.video.raiclick/README | 0
plugin.video.raiclick/addon.xml | 19 ++
plugin.video.raiclick/default.py | 106 ++++++++++
plugin.video.raiclick/icon.png | Bin 0 -> 85516 bytes
plugin.video.raiclick/raiclicklib.py | 83 ++++++++
plugin.video.vega/README | 2 +-
plugin.video.vega/addon.xml | 6 +-
plugin.video.vega/changelog.txt | 6 +-
plugin.video.vega/default.py | 9 +-
.../resources/language/English/strings.xml | 2 +-
plugin.video.vega/resources/settings.xml | 4 +-
plugin.video.vimeo/VimeoCore.py | 19 ++-
plugin.video.vimeo/addon.xml | 2 +-
plugin.video.vimeo/changelog.txt | 3 +
plugin.video.vimeo/default.py | 2 +-
plugin.video.xbmcflicks/addon.xml | 2 +-
plugin.video.xbmcflicks/changelog.txt | 3 +-
plugin.video.xbmcflicks/icon.png | Bin 43884 -> 15022 bytes
plugin.video.xbmcflicks/resources/disc.png | Bin 42882 -> 0 bytes
plugin.video.xbmcflicks/resources/disc_by_mail.png | Bin 0 -> 59203 bytes
.../resources/disc_by_mail_main.png | Bin 0 -> 59203 bytes
.../resources/disc_queue_all.png | Bin 0 -> 50998 bytes
.../resources/disc_queue_at_home.png | Bin 0 -> 39396 bytes
.../resources/disc_queue_movies.png | Bin 0 -> 55743 bytes
.../resources/disc_queue_tv.png | Bin 0 -> 49329 bytes
.../resources/disc_recommended.png | Bin 0 -> 37401 bytes
plugin.video.xbmcflicks/resources/disc_search.png | Bin 0 -> 40784 bytes
.../resources/disc_top25_action2.png | Bin 0 -> 92637 bytes
.../resources/disc_top25_anime2.png | Bin 0 -> 112578 bytes
.../resources/disc_top25_bluray2.png | Bin 0 -> 72585 bytes
.../resources/disc_top25_bygenre.png | Bin 0 -> 47291 bytes
.../resources/disc_top25_children2.png | Bin 0 -> 103233 bytes
.../resources/disc_top25_classics2.png | Bin 0 -> 84302 bytes
.../resources/disc_top25_comedy2.png | Bin 0 -> 105658 bytes
.../resources/disc_top25_documentary2.png | Bin 0 -> 106600 bytes
.../resources/disc_top25_drama2.png | Bin 0 -> 89677 bytes
.../resources/disc_top25_faith2.png | Bin 0 -> 77200 bytes
.../resources/disc_top25_foreign2.png | Bin 0 -> 129148 bytes
.../resources/disc_top25_horror2.png | Bin 0 -> 95320 bytes
.../resources/disc_top25_independent2.png | Bin 0 -> 100446 bytes
.../resources/disc_top25_lesbian2.png | Bin 0 -> 100864 bytes
.../resources/disc_top25_music2.png | Bin 0 -> 104266 bytes
.../resources/disc_top25_romance2.png | Bin 0 -> 104898 bytes
.../resources/disc_top25_scifi2.png | Bin 0 -> 116904 bytes
.../resources/disc_top25_special_interest2.png | Bin 0 -> 96827 bytes
.../resources/disc_top25_sports2.png | Bin 0 -> 94927 bytes
.../resources/disc_top25_television2.png | Bin 0 -> 90891 bytes
.../resources/disc_top25_thrillers2.png | Bin 0 -> 119278 bytes
plugin.video.xbmcflicks/resources/instant.png | Bin 43401 -> 0 bytes
.../resources/instant_new_all.png | Bin 0 -> 54724 bytes
.../resources/instant_new_all_movies.png | Bin 0 -> 57229 bytes
.../resources/instant_new_all_tv.png | Bin 0 -> 55677 bytes
.../resources/instant_new_top25.png | Bin 0 -> 50490 bytes
.../resources/instant_new_top25_movies.png | Bin 0 -> 53663 bytes
.../resources/instant_new_top25_tv.png | Bin 0 -> 51728 bytes
.../resources/instant_queue_all.png | Bin 0 -> 43480 bytes
.../resources/instant_queue_movies.png | Bin 0 -> 47669 bytes
.../resources/instant_queue_tv.png | Bin 0 -> 39821 bytes
.../resources/instant_search.png | Bin 0 -> 29219 bytes
.../resources/instant_watch_main.png | Bin 0 -> 37734 bytes
.../resources/instant_watch_recommended.png | Bin 0 -> 26689 bytes
.../resources/instant_watch_top25s.png | Bin 0 -> 39652 bytes
plugin.video.xbmcflicks/resources/iqueue_all.png | Bin 43488 -> 0 bytes
.../resources/iqueue_movies.png | Bin 47965 -> 0 bytes
plugin.video.xbmcflicks/resources/iqueue_tv.png | Bin 40893 -> 0 bytes
.../resources/language/English/strings.xml | 23 ++
.../resources/language/Finnish/strings.xml | 61 ------
.../resources/language/German/strings.xml | 61 ------
.../resources/language/Polish/strings.xml | 61 ------
.../resources/language/Swedish/strings.xml | 61 ------
plugin.video.xbmcflicks/resources/lib/iqueue.py | 145 ++++++++++++--
plugin.video.xbmcflicks/resources/lib/menu.py | 199 ++++++++++++++-----
plugin.video.xbmcflicks/resources/lib/oauth.py | 8 +-
plugin.video.xbmcflicks/resources/lib/settings.py | 9 +
plugin.video.xbmcflicks/resources/new_all.png | Bin 43025 -> 0 bytes
plugin.video.xbmcflicks/resources/new_top25.png | Bin 42233 -> 0 bytes
plugin.video.xbmcflicks/resources/recog.png | Bin 35086 -> 0 bytes
.../resources/rental_history.png | Bin 0 -> 41276 bytes
.../resources/rental_history_returned.png | Bin 0 -> 39960 bytes
.../resources/rental_history_shipped.png | Bin 0 -> 41452 bytes
.../resources/rental_history_watched.png | Bin 0 -> 29824 bytes
plugin.video.xbmcflicks/resources/search.png | Bin 38729 -> 0 bytes
plugin.video.xbmcflicks/resources/settings.xml | 20 ++
96 files changed, 1287 insertions(+), 332 deletions(-)
copy {plugin.audio.soundcloud => plugin.video.classiccinema}/LICENSE.txt (100%)
create mode 100644 plugin.video.classiccinema/README.markdown
create mode 100755 plugin.video.classiccinema/addon.py
create mode 100644 plugin.video.classiccinema/addon.xml
create mode 100644 plugin.video.classiccinema/icon.png
copy {plugin.audio.soundcloud/oauth2/clients =>
plugin.video.classiccinema/resources}/__init__.py (100%)
create mode 100644
plugin.video.classiccinema/resources/language/English/strings.xml
copy {plugin.audio.soundcloud/oauth2/clients =>
plugin.video.classiccinema/resources/lib}/__init__.py (100%)
create mode 100644 plugin.video.classiccinema/resources/lib/googlevideo.py
create mode 100644 plugin.video.classiccinema/resources/lib/xbmccommon.py
create mode 100644 plugin.video.classiccinema/resources/lib/xbmcvideoplugin.py
copy {plugin.video.tvkaista => plugin.video.raiclick}/LICENSE.txt (100%)
copy plugin.audio.soundcloud/oauth2/clients/__init__.py =>
plugin.video.raiclick/README (100%)
create mode 100644 plugin.video.raiclick/addon.xml
create mode 100644 plugin.video.raiclick/default.py
create mode 100644 plugin.video.raiclick/icon.png
create mode 100644 plugin.video.raiclick/raiclicklib.py
delete mode 100644 plugin.video.xbmcflicks/resources/disc.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_by_mail.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_by_mail_main.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_queue_all.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_queue_at_home.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_queue_movies.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_queue_tv.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_recommended.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_search.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_top25_action2.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_top25_anime2.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_top25_bluray2.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_top25_bygenre.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_top25_children2.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_top25_classics2.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_top25_comedy2.png
create mode 100644
plugin.video.xbmcflicks/resources/disc_top25_documentary2.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_top25_drama2.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_top25_faith2.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_top25_foreign2.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_top25_horror2.png
create mode 100644
plugin.video.xbmcflicks/resources/disc_top25_independent2.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_top25_lesbian2.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_top25_music2.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_top25_romance2.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_top25_scifi2.png
create mode 100644
plugin.video.xbmcflicks/resources/disc_top25_special_interest2.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_top25_sports2.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_top25_television2.png
create mode 100644 plugin.video.xbmcflicks/resources/disc_top25_thrillers2.png
delete mode 100644 plugin.video.xbmcflicks/resources/instant.png
create mode 100644 plugin.video.xbmcflicks/resources/instant_new_all.png
create mode 100644 plugin.video.xbmcflicks/resources/instant_new_all_movies.png
create mode 100644 plugin.video.xbmcflicks/resources/instant_new_all_tv.png
create mode 100644 plugin.video.xbmcflicks/resources/instant_new_top25.png
create mode 100644
plugin.video.xbmcflicks/resources/instant_new_top25_movies.png
create mode 100644 plugin.video.xbmcflicks/resources/instant_new_top25_tv.png
create mode 100644 plugin.video.xbmcflicks/resources/instant_queue_all.png
create mode 100644 plugin.video.xbmcflicks/resources/instant_queue_movies.png
create mode 100644 plugin.video.xbmcflicks/resources/instant_queue_tv.png
create mode 100644 plugin.video.xbmcflicks/resources/instant_search.png
create mode 100644 plugin.video.xbmcflicks/resources/instant_watch_main.png
create mode 100644
plugin.video.xbmcflicks/resources/instant_watch_recommended.png
create mode 100644 plugin.video.xbmcflicks/resources/instant_watch_top25s.png
delete mode 100644 plugin.video.xbmcflicks/resources/iqueue_all.png
delete mode 100644 plugin.video.xbmcflicks/resources/iqueue_movies.png
delete mode 100644 plugin.video.xbmcflicks/resources/iqueue_tv.png
delete mode 100644
plugin.video.xbmcflicks/resources/language/Finnish/strings.xml
delete mode 100644
plugin.video.xbmcflicks/resources/language/German/strings.xml
delete mode 100644
plugin.video.xbmcflicks/resources/language/Polish/strings.xml
delete mode 100644
plugin.video.xbmcflicks/resources/language/Swedish/strings.xml
delete mode 100644 plugin.video.xbmcflicks/resources/new_all.png
delete mode 100644 plugin.video.xbmcflicks/resources/new_top25.png
delete mode 100644 plugin.video.xbmcflicks/resources/recog.png
create mode 100644 plugin.video.xbmcflicks/resources/rental_history.png
create mode 100644
plugin.video.xbmcflicks/resources/rental_history_returned.png
create mode 100644 plugin.video.xbmcflicks/resources/rental_history_shipped.png
create mode 100644 plugin.video.xbmcflicks/resources/rental_history_watched.png
delete mode 100644 plugin.video.xbmcflicks/resources/search.png
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
