The branch, dharma has been updated
via 8379c5ef89bcbc1d95b986c9e7148b44b8d0fb03 (commit)
via f78d57e337a50e912f9cd79f0c046c7338d1dfbf (commit)
via ce617c67939b2fa7589d24f795b4f9e3746857f9 (commit)
from b5f028b74dc84ae21f4fe0a3a8f244cd90bcdab2 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=8379c5ef89bcbc1d95b986c9e7148b44b8d0fb03
commit 8379c5ef89bcbc1d95b986c9e7148b44b8d0fb03
Author: spiff <[email protected]>
Date: Mon Jan 3 21:11:28 2011 +0100
[plugin.video.escapistmagazine] updated to version 0.1.4
diff --git a/.gitignore b/.gitignore
index 016afbe..8ff4498 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,5 +29,4 @@ plugin.video.eyetv.parser/.git
plugin.video.xbmcflicks/.git
plugin.video.gamestar/.git
plugin.video.gamestar/.gitignore
-plugin.video.escapistmagazine/images.raw*
plugin.video.revision3/.git
diff --git a/plugin.video.escapistmagazine/addon.xml
b/plugin.video.escapistmagazine/addon.xml
index 6f411fc..1c789dd 100644
--- a/plugin.video.escapistmagazine/addon.xml
+++ b/plugin.video.escapistmagazine/addon.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon
id="plugin.video.escapistmagazine"
- name="Escapist Magazine"
- version="0.1.3"
+ name="The Escapist"
+ version="0.1.4"
provider-name="Mike Cronce"
>
<requires>
diff --git a/plugin.video.escapistmagazine/changelog.txt
b/plugin.video.escapistmagazine/changelog.txt
index c841b2b..b43df83 100644
--- a/plugin.video.escapistmagazine/changelog.txt
+++ b/plugin.video.escapistmagazine/changelog.txt
@@ -1,3 +1,7 @@
+0.1.4 (2010-01-01) (14)
+ Removed the images.raw directory and the huge raw bitmaps contained
within from the stable release
+ Fixed the plugin name - forgot to do this before submitting it
+
0.1.3 (2010-01-01) (8)
Added fanart.jpg and changed icon.png to conform to the XBMC plugin
image guidelines
Added this changelog
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=f78d57e337a50e912f9cd79f0c046c7338d1dfbf
commit f78d57e337a50e912f9cd79f0c046c7338d1dfbf
Author: spiff <[email protected]>
Date: Mon Jan 3 21:09:34 2011 +0100
[plugin.video.xbmcflicks] updated to version 1.0.11
diff --git a/plugin.video.xbmcflicks/addon.xml
b/plugin.video.xbmcflicks/addon.xml
index 0ef7908..0b17f6b 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.10"
+ version="1.0.11"
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 9e7c8d1..13fe17b 100644
--- a/plugin.video.xbmcflicks/changelog.txt
+++ b/plugin.video.xbmcflicks/changelog.txt
@@ -3,4 +3,5 @@
1.0.7 - fixed path issue within the plugin and git repo, fixed issue with
missing userinfo.txt and missing links folder
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
\ No newline at end of file
+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
diff --git a/plugin.video.xbmcflicks/resources/language/English/strings.xml
b/plugin.video.xbmcflicks/resources/language/English/strings.xml
index b5eb0be..b907a09 100644
--- a/plugin.video.xbmcflicks/resources/language/English/strings.xml
+++ b/plugin.video.xbmcflicks/resources/language/English/strings.xml
@@ -27,6 +27,7 @@
<string id="30029">Use Alt Player Location</string>
<string id="30030">Expand TV Episodes Automatically</string>
<string id="30031">OSX</string>
+ <string id="30032">Are you in Canada?</string>
<string id="30090">Debug Options</string>
<string id="30091">Enable Debug Logging</string>
<string id="30093">Enable Verbose User Information</string>
diff --git a/plugin.video.xbmcflicks/resources/language/Finnish/strings.xml
b/plugin.video.xbmcflicks/resources/language/Finnish/strings.xml
index b5eb0be..b907a09 100644
--- a/plugin.video.xbmcflicks/resources/language/Finnish/strings.xml
+++ b/plugin.video.xbmcflicks/resources/language/Finnish/strings.xml
@@ -27,6 +27,7 @@
<string id="30029">Use Alt Player Location</string>
<string id="30030">Expand TV Episodes Automatically</string>
<string id="30031">OSX</string>
+ <string id="30032">Are you in Canada?</string>
<string id="30090">Debug Options</string>
<string id="30091">Enable Debug Logging</string>
<string id="30093">Enable Verbose User Information</string>
diff --git a/plugin.video.xbmcflicks/resources/language/German/strings.xml
b/plugin.video.xbmcflicks/resources/language/German/strings.xml
index b5eb0be..b907a09 100644
--- a/plugin.video.xbmcflicks/resources/language/German/strings.xml
+++ b/plugin.video.xbmcflicks/resources/language/German/strings.xml
@@ -27,6 +27,7 @@
<string id="30029">Use Alt Player Location</string>
<string id="30030">Expand TV Episodes Automatically</string>
<string id="30031">OSX</string>
+ <string id="30032">Are you in Canada?</string>
<string id="30090">Debug Options</string>
<string id="30091">Enable Debug Logging</string>
<string id="30093">Enable Verbose User Information</string>
diff --git a/plugin.video.xbmcflicks/resources/language/Polish/strings.xml
b/plugin.video.xbmcflicks/resources/language/Polish/strings.xml
index b5eb0be..b907a09 100644
--- a/plugin.video.xbmcflicks/resources/language/Polish/strings.xml
+++ b/plugin.video.xbmcflicks/resources/language/Polish/strings.xml
@@ -27,6 +27,7 @@
<string id="30029">Use Alt Player Location</string>
<string id="30030">Expand TV Episodes Automatically</string>
<string id="30031">OSX</string>
+ <string id="30032">Are you in Canada?</string>
<string id="30090">Debug Options</string>
<string id="30091">Enable Debug Logging</string>
<string id="30093">Enable Verbose User Information</string>
diff --git a/plugin.video.xbmcflicks/resources/language/Swedish/strings.xml
b/plugin.video.xbmcflicks/resources/language/Swedish/strings.xml
index b5eb0be..b907a09 100644
--- a/plugin.video.xbmcflicks/resources/language/Swedish/strings.xml
+++ b/plugin.video.xbmcflicks/resources/language/Swedish/strings.xml
@@ -27,6 +27,7 @@
<string id="30029">Use Alt Player Location</string>
<string id="30030">Expand TV Episodes Automatically</string>
<string id="30031">OSX</string>
+ <string id="30032">Are you in Canada?</string>
<string id="30090">Debug Options</string>
<string id="30091">Enable Debug Logging</string>
<string id="30093">Enable Verbose User Information</string>
diff --git a/plugin.video.xbmcflicks/resources/lib/Netflix.py
b/plugin.video.xbmcflicks/resources/lib/Netflix.py
index 783ef96..7dd72bc 100644
--- a/plugin.video.xbmcflicks/resources/lib/Netflix.py
+++ b/plugin.video.xbmcflicks/resources/lib/Netflix.py
@@ -202,8 +202,7 @@ class NetflixUser:
return info
- def getInstantQueue(self,historyType=None,startIndex=None,
- maxResults=None,updatedMin=None):
+ def
getInstantQueue(self,historyType=None,startIndex=None,maxResults=None,updatedMin=None,caUser=None):
accessToken=self.accessToken
parameters = {}
if startIndex:
@@ -212,7 +211,10 @@ class NetflixUser:
parameters['max_results'] = maxResults
if updatedMin:
parameters['updated_min'] = updatedMin
-
+ if caUser:
+ if (caUser == True):
+ parameters['country'] = "ca"
+ print "params: " + str(parameters)
parameters['v'] = str('2.0')
parameters['filters'] =
'http://api.netflix.com/categories/title_formats/instant'
parameters['expand'] =
'@title,@synopsis,@directors,@formats,@episodes,@short_synopsis'
@@ -233,7 +235,7 @@ class NetflixUser:
return info
- def
getDiscQueue(self,historyType=None,startIndex=None,maxResults=None,updatedMin=None):
+ def
getDiscQueue(self,historyType=None,startIndex=None,maxResults=None,updatedMin=None,caUser=None):
accessToken=self.accessToken
parameters = {}
if startIndex:
@@ -242,7 +244,10 @@ class NetflixUser:
parameters['max_results'] = maxResults
if updatedMin:
parameters['updated_min'] = updatedMin
-
+ if caUser:
+ if (caUser == True):
+ parameters['country'] = "ca"
+
parameters['v'] = str('2.0')
#parameters['filters'] =
'http://api.netflix.com/categories/title_formats/disc'
parameters['expand'] =
'@title,@synopsis,@directors,@formats,@episodes,@short_synopsis'
@@ -263,8 +268,7 @@ class NetflixUser:
return info
- def getAtHomeList(self,historyType=None,startIndex=None,
- maxResults=None,updatedMin=None):
+ def
getAtHomeList(self,historyType=None,startIndex=None,maxResults=None,updatedMin=None):
accessToken=self.accessToken
parameters = {}
if startIndex:
@@ -296,7 +300,7 @@ class NetflixUser:
return info
- def
getRecommendedQueue(self,startIndex=None,maxResults=None,updatedMin=None):
+ def
getRecommendedQueue(self,startIndex=None,maxResults=None,updatedMin=None,caUser=None):
accessToken=self.accessToken
parameters = {}
if startIndex:
@@ -305,6 +309,10 @@ class NetflixUser:
parameters['max_results'] = maxResults
if updatedMin:
parameters['updated_min'] = updatedMin
+ if caUser:
+ if (caUser == True):
+ parameters['country'] = "ca"
+
parameters['v'] = str('2.0')
parameters['filters'] =
'http://api.netflix.com/categories/title_formats/instant'
parameters['expand'] =
'@title,@cast,@synopsis,@directors,@formats,@episodes,@short_synopsis'
@@ -361,14 +369,17 @@ class NetflixUser:
return info
- def searchTitles(self, term, queue, startIndex=None,maxResults=None):
+ def searchTitles(self, term, queue,
startIndex=None,maxResults=None,caUser=None):
requestUrl = '/catalog/titles'
parameters = {'term': term}
if startIndex:
parameters['start_index'] = startIndex
if maxResults:
parameters['max_results'] = maxResults
-
+ if caUser:
+ if (caUser == True):
+ parameters['country'] = "ca"
+
parameters['v'] = str('2.0')
parameters['filters'] =
'http://api.netflix.com/categories/title_formats/' + queue
parameters['expand'] =
'@title,@synopsis,@directors,@formats,@episodes,@short_synopsis'
diff --git a/plugin.video.xbmcflicks/resources/lib/iqueue.py
b/plugin.video.xbmcflicks/resources/lib/iqueue.py
index 19f1210..145f798 100644
--- a/plugin.video.xbmcflicks/resources/lib/iqueue.py
+++ b/plugin.video.xbmcflicks/resources/lib/iqueue.py
@@ -643,7 +643,7 @@ def addDir(name,url,mode,iconimage,data):
def getUserDiscQueue(netflix,user,displayWhat):
print "*** What's in the Disc Queue? ***"
- feeds = netflix.user.getDiscQueue(None,None,500)
+ feeds = netflix.user.getDiscQueue(None,None,500,None,IN_CANADA)
if (VERBOSE_USER_LOG):
print feeds
@@ -677,7 +677,9 @@ def getUserAtHomeItems(netflix,user):
def getUserInstantQueue(netflix,user, displayWhat):
print "*** What's in the Instant Queue? ***"
#get user setting for max number to download
- feeds = netflix.user.getInstantQueue(None,None,MAX_INSTANTQUEUE_RETREVE)
+ feeds =
netflix.user.getInstantQueue(None,None,MAX_INSTANTQUEUE_RETREVE,None,IN_CANADA)
+ print "Max value: " + str(MAX_INSTANTQUEUE_RETREVE)
+ print "In CA: " + str(IN_CANADA)
if (VERBOSE_USER_LOG):
print feeds
@@ -717,7 +719,7 @@ def getUserInstantQueue(netflix,user, displayWhat):
def getUserRecommendedQueue(netflix,user):
initApp()
- feeds = netflixClient.user.getRecommendedQueue(0,100)
+ feeds = netflixClient.user.getRecommendedQueue(0,100,None,IN_CANADA)
if(DEBUG):
print simplejson.dumps(feeds,indent=4)
counter = 0
@@ -833,6 +835,7 @@ def initApp():
global arg
global netflixClient
global pg
+ global IN_CANADA
global APPEND_YEAR_TO_TITLE
global POSTER_QUAL
global MAX_INSTANTQUEUE_RETREVE
@@ -859,6 +862,7 @@ def initApp():
DEBUG = getUserSettingDebug(arg)
VERBOSE_USER_LOG = getUserSettingVerboseUserInfo(arg)
OSX = getUserSettingOSX(arg)
+ IN_CANADA = getUserSettingCaUser(arg)
AUTO_EXPAND_EPISODES = getUserSettingExpandEpisodes(arg)
useAltPlayer = getUserSettingAltPlayer(arg)
POSTER_QUAL = getUserSettingPosterQuality(arg)
diff --git a/plugin.video.xbmcflicks/resources/lib/menu.py
b/plugin.video.xbmcflicks/resources/lib/menu.py
index ff22ea8..4f631f3 100644
--- a/plugin.video.xbmcflicks/resources/lib/menu.py
+++ b/plugin.video.xbmcflicks/resources/lib/menu.py
@@ -172,6 +172,10 @@ SUBMENUR3 = "Watched"
# plugin handle
handle = int(sys.argv[1])
+# settings
+global IN_CANADA
+IN_CANADA = getUserSettingCaUser(handle)
+
# utility functions
def parameters_string_to_dict(parameters):
''' Convert parameters encoded in a URL to a dict. '''
@@ -207,8 +211,11 @@ def show_instant_menu():
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")
- 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")
+
+ 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)
xbmcplugin.endOfDirectory(handle=handle, succeeded=True)
@@ -217,7 +224,10 @@ 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=SUBMENUD7, parameters={ PARAMETER_KEY_MODE:MODED7 },
isFolder=True)
+
+ if(not IN_CANADA):
+ addDirectoryItem(name=SUBMENUD7, parameters={ PARAMETER_KEY_MODE:MODED7
}, isFolder=True)
+
addDirectoryItem(name=SUBMENUD2, parameters={ PARAMETER_KEY_MODE:MODED2 },
isFolder=True)
addDirectoryItem(name=SUBMENUD3, parameters={ PARAMETER_KEY_MODE:MODED3 },
isFolder=True)
diff --git a/plugin.video.xbmcflicks/resources/lib/settings.py
b/plugin.video.xbmcflicks/resources/lib/settings.py
index b40cff1..6cc3973 100644
--- a/plugin.video.xbmcflicks/resources/lib/settings.py
+++ b/plugin.video.xbmcflicks/resources/lib/settings.py
@@ -18,6 +18,15 @@ def getUserSettingOSX(arg):
v = False
return v
+def getUserSettingCaUser(arg):
+ cau = xbmcplugin.getSetting(arg,'caUser')
+ v = False
+ if(cau == "0"):
+ v = True
+ if(cau == "1"):
+ v = False
+ return v
+
def getUserSettingExpandEpisodes(arg):
ee = xbmcplugin.getSetting(arg,'expandEpisodes')
v = False
diff --git a/plugin.video.xbmcflicks/resources/settings.xml
b/plugin.video.xbmcflicks/resources/settings.xml
index 0533c51..1522e40 100644
--- a/plugin.video.xbmcflicks/resources/settings.xml
+++ b/plugin.video.xbmcflicks/resources/settings.xml
@@ -7,6 +7,7 @@
<setting id="appendYear" type="enum" lvalues="30016|30017" label="30018"
default="0" />
<setting id="expandEpisodes" type="enum" lvalues="30016|30017"
label="30030" default="1" />
<setting id="yearLimit" type="number" label="30221" default="1800" />
+ <setting id="caUser" type="enum" lvalues="30016|30017" label="30032"
default="1" />
</category>
<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"/>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=ce617c67939b2fa7589d24f795b4f9e3746857f9
commit ce617c67939b2fa7589d24f795b4f9e3746857f9
Author: spiff <[email protected]>
Date: Mon Jan 3 21:07:52 2011 +0100
[plugin.video.revision3] updated to version 1.0.3
diff --git a/.gitignore b/.gitignore
index 947700f..016afbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ plugin.video.xbmcflicks/.git
plugin.video.gamestar/.git
plugin.video.gamestar/.gitignore
plugin.video.escapistmagazine/images.raw*
+plugin.video.revision3/.git
diff --git a/plugin.video.revision3/addon.xml b/plugin.video.revision3/addon.xml
index 8503613..9a47d70 100644
--- a/plugin.video.revision3/addon.xml
+++ b/plugin.video.revision3/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.revision3"
name="Revision3"
- version="1.0.2"
+ version="1.0.3"
provider-name="stacked">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.video.revision3/changelog.txt
b/plugin.video.revision3/changelog.txt
index 529371d..6698b23 100644
--- a/plugin.video.revision3/changelog.txt
+++ b/plugin.video.revision3/changelog.txt
@@ -1,3 +1,8 @@
+[B]Version 1.0.3[/B]
+
+- Changed the default video quality to Quicktime HD
+- Cleaned up code and settings
+
[B]Version 1.0.2[/B]
- Updated icon
diff --git a/plugin.video.revision3/default.py
b/plugin.video.revision3/default.py
index c894661..26121f2 100644
--- a/plugin.video.revision3/default.py
+++ b/plugin.video.revision3/default.py
@@ -4,8 +4,8 @@ import xbmc, xbmcgui, xbmcplugin, urllib2, urllib, re, string,
sys, os, tracebac
__plugin__ = 'Revision3'
__author__ = 'stacked <[email protected]>'
__url__ = 'http://code.google.com/p/plugin/'
-__date__ = '09-26-2010'
-__version__ = '1.0.2'
+__date__ = '12-21-2010'
+__version__ = '1.0.3'
__settings__ = xbmcaddon.Addon(id='plugin.video.revision3')
def open_url(url):
@@ -15,18 +15,8 @@ def open_url(url):
content.close()
return data
-def check_for_updates():
- print __plugin__+' v'+__version__
- url = 'http://code.google.com/feeds/p/plugin/downloads/basic'
- data = open_url(url)
- match =
re.compile('detail\?name=plugin.video.revision3-(.+?)\.zip').findall(data)
- for newversion in match :
- if newversion.find(__version__) != 0:
- dia = xbmcgui.Dialog()
- ok = dia.ok(__plugin__,
__settings__.getLocalizedString(30012) + ' tinyurl.com/addonupdates\n' +
__settings__.getLocalizedString(30013) + __version__ + ' - ' +
__settings__.getLocalizedString(30014) + newversion)
-
def build_main_directory():
- quality = __settings__.getLocalizedString(30000 + 5 +
int(__settings__.getSetting('quality')))
+ quality = __settings__.getSetting('quality')
url = 'http://revision3.com/shows/'
data = open_url(url)
match = re.compile('<ul id="shows">(.+?)<div id="footer"
class="clear">', re.DOTALL).findall(data)
@@ -51,7 +41,7 @@ def build_sub_directory(url, name):
count = 0
if len(match) == 0:
dialog = xbmcgui.Dialog()
- ok = dialog.ok(__plugin__,
__settings__.getLocalizedString(30021) + '\n' +
__settings__.getLocalizedString(30000 + 5 +
int(__settings__.getSetting('quality'))) +
__settings__.getLocalizedString(30022))
+ ok = dialog.ok(__plugin__,
__settings__.getLocalizedString(30001) + '\n' +
__settings__.getSetting('quality') + __settings__.getLocalizedString(30002))
for title in match:
episode = int(number[count].rsplit('/', 2)[1].lstrip('0'))
url = link[count]
@@ -69,73 +59,33 @@ def clean(name):
return name
def play_video(url, name, plot, genre, episode):
- filename = genre + ' Episode ' + str(episode) + '.' +
url.replace('/tzdaily','').rsplit('/')[10].split('.')[2]
- def Download(url, dest):
- dialog = xbmcgui.DialogProgress()
- dialog.create(__settings__.getLocalizedString(30015), name,
__settings__.getLocalizedString(30016) + filename)
- urllib.urlretrieve(url, dest, lambda nb, bs, fs, url = url:
_pbhook(nb, bs, fs, url, dialog))
- def _pbhook(numblocks, blocksize, filesize, url = None,dialog = None):
- try:
- percent = min((numblocks * blocksize * 100) / filesize,
100)
- dialog.update(percent)
- except:
- percent = 100
- dialog.update(percent)
- if dialog.iscanceled():
- dialog.close()
- filepath = None
- stream = 'false'
- if (__settings__.getSetting('download') == 'true'):
- filepath =
xbmc.translatePath(os.path.join(__settings__.getSetting('download_path'),
filename))
- Download(url, filepath)
- elif (__settings__.getSetting('download') == 'false' and
__settings__.getSetting('download_ask') == 'true'):
- dialog = xbmcgui.Dialog()
- choice = dialog.select(__plugin__,
[__settings__.getLocalizedString(30017),
__settings__.getLocalizedString(30018), __settings__.getLocalizedString(30019)])
- if (choice == 0):
- filepath =
xbmc.translatePath(os.path.join(__settings__.getSetting('download_path'),
filename))
- Download(url, filepath)
- elif (choice == 1):
- stream = 'true'
- else:
- pass
- elif (__settings__.getSetting('download') == 'false' and
__settings__.getSetting('download_ask') == 'false'):
- stream = 'true'
- if __settings__.getSetting('dvdplayer') == 'true':
- player_type = xbmc.PLAYER_CORE_DVDPLAYER
- else:
- player_type = xbmc.PLAYER_CORE_MPLAYER
image = xbmc.getInfoImage( 'ListItem.Thumb' )
listitem = xbmcgui.ListItem(label = name , iconImage =
'DefaultVideo.png', thumbnailImage = image)
listitem.setInfo( type = "Video", infoLabels={ "Title": name,
"Director": __plugin__, "Studio": genre, "Plot": plot, "Episode": int(episode)
} )
- if (filepath != None and os.path.isfile(filepath)):
- xbmc.Player(player_type).play(str(filepath), listitem)
- elif (stream == 'true'):
- xbmc.Player(player_type).play(str(url), listitem)
+ xbmc.Player(xbmc.PLAYER_CORE_DVDPLAYER).play(str(url), listitem)
xbmc.sleep(200)
def get_params():
- param=[]
- paramstring=sys.argv[2]
- if len(paramstring)>=2:
- params=sys.argv[2]
- cleanedparams=params.replace('?','')
- if (params[len(params)-1]=='/'):
- params=params[0:len(params)-2]
- pairsofparams=cleanedparams.split('&')
- param={}
- for i in range(len(pairsofparams)):
- splitparams={}
- splitparams=pairsofparams[i].split('=')
- if (len(splitparams))==2:
- param[splitparams[0]]=splitparams[1]
-
- return param
+ param=[]
+ paramstring=sys.argv[2]
+ if len(paramstring)>=2:
+ params=sys.argv[2]
+ cleanedparams=params.replace('?','')
+ if (params[len(params)-1]=='/'):
+ params=params[0:len(params)-2]
+ pairsofparams=cleanedparams.split('&')
+ param={}
+ for i in range(len(pairsofparams)):
+ splitparams={}
+ splitparams=pairsofparams[i].split('=')
+ if (len(splitparams))==2:
+ param[splitparams[0]]=splitparams[1]
+ return param
params = get_params()
url = None
name = None
mode = None
-page = 1
plot = None
genre = None
episode = None
@@ -153,10 +103,6 @@ try:
except:
pass
try:
- page = int(params["page"])
-except:
- pass
-try:
plot = urllib.unquote_plus(params["plot"])
except:
pass
@@ -170,8 +116,6 @@ except:
pass
if mode == None:
- #if __settings__.getSetting('update') == 'true':
- # check_for_updates()
build_main_directory()
elif mode == 1:
build_sub_directory(url, name)
diff --git a/plugin.video.revision3/resources/language/English/strings.xml
b/plugin.video.revision3/resources/language/English/strings.xml
index f90550d..762e745 100644
--- a/plugin.video.revision3/resources/language/English/strings.xml
+++ b/plugin.video.revision3/resources/language/English/strings.xml
@@ -1,26 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
- <string id="30000">Use DVD Player instead of regular player</string>
- <string id="30001">Download and Play video</string>
- <string id="30002">Download path</string>
- <string id="30003">Ask for download before playing video</string>
- <string id="30004">Video quality (Restart plugin to enable)</string>
- <string id="30005">quicktime-high-definition</string>
- <string id="30006">quicktime-large</string>
- <string id="30007">quicktime-small</string>
- <string id="30008">wmv-large</string>
- <string id="30009">wmv-small</string>
- <string id="30010">xvid-large</string>
- <string id="30011">xvid-small</string>
- <string id="30012">Updates are available at</string>
- <string id="30013">Current Version: </string>
- <string id="30014">Update Version: </string>
- <string id="30015">Downloading</string>
- <string id="30016">Filename: </string>
- <string id="30017">Download & Play</string>
- <string id="30018">Stream</string>
- <string id="30019">Exit</string>
- <string id="30020">Check for updates</string>
- <string id="30021">It appears there are no episodes available in
the</string>
- <string id="30022"> format. Change the quality settings.</string>
+ <string id="30000">Video Quality (Restart Required)</string>
+ <string id="30001">It appears there are no episodes available in
the</string>
+ <string id="30002"> format. Change the quality settings.</string>
+ <string id="30003">quicktime-high-definition</string>
+ <string id="30004">quicktime-large</string>
+ <string id="30005">quicktime-small</string>
+ <string id="30006">wmv-large</string>
+ <string id="30007">wmv-small</string>
+ <string id="30008">xvid-large</string>
+ <string id="30009">xvid-small</string>
</strings>
diff --git a/plugin.video.revision3/resources/language/Finnish/strings.xml
b/plugin.video.revision3/resources/language/Finnish/strings.xml
index 91ea360..0059a34 100644
--- a/plugin.video.revision3/resources/language/Finnish/strings.xml
+++ b/plugin.video.revision3/resources/language/Finnish/strings.xml
@@ -1,27 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<strings> <!-- 24.12.2009 Finnish -->
- <string id="30000">Käytä DVD Player-soitinta</string>
- <string id="30001">Lataa ja toista video</string>
- <string id="30002">Latauspolku</string>
- <string id="30003">Kysy latauksesta ennen toistoa</string>
- <string id="30004">Videolaatu (Käynnistä lisäke uudelleen)</string>
- <!-- Don't translate the quality, it breaks the plugin -->
- <string id="30005">quicktime-high-definition</string>
- <string id="30006">quicktime-large</string>
- <string id="30007">quicktime-small</string>
- <string id="30008">wmv-large</string>
- <string id="30009">wmv-small</string>
- <string id="30010">xvid-large</string>
- <string id="30011">xvid-small</string>
- <string id="30012">Päivitykset ovat saatavilla</string>
- <string id="30013">Nykyinen versio: </string>
- <string id="30014">Päivitä versio: </string>
- <string id="30015">Lataaminen</string>
- <string id="30016">Tiedostonimi: </string>
- <string id="30017">Lataa & Pelata</string>
- <string id="30018">Virta</string>
- <string id="30019">Poistua</string>
- <string id="30020">Tarkista päivitykset</string>
- <string id="30021">Näyttää siltä, ei ole jaksoja saatavilla</string>
- <string id="30022"> muodossa. Muuta laatu asetuksia.</string>
+<strings>
+ <string id="30000">Videolaatu (Käynnistä lisäke uudelleen)</string>
+ <string id="30001">Näyttää siltä, ei ole jaksoja saatavilla</string>
+ <string id="30002"> muodossa. Muuta laatu asetuksia.</string>
+ <string id="30003">quicktime-high-definition</string>
+ <string id="30004">quicktime-large</string>
+ <string id="30005">quicktime-small</string>
+ <string id="30006">wmv-large</string>
+ <string id="30007">wmv-small</string>
+ <string id="30008">xvid-large</string>
+ <string id="30009">xvid-small</string>
</strings>
diff --git a/plugin.video.revision3/resources/language/Hungarian/strings.xml
b/plugin.video.revision3/resources/language/Hungarian/strings.xml
index 7514015..56f30e8 100644
--- a/plugin.video.revision3/resources/language/Hungarian/strings.xml
+++ b/plugin.video.revision3/resources/language/Hungarian/strings.xml
@@ -1,26 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
- <string id="30000">A DVD Player használata a normál lejátszó
helyett</string>
- <string id="30001">Videó letöltése és lejátszása</string>
- <string id="30002">Letöltési útvonal</string>
- <string id="30003">Letöltés felajánlása lejátszás elÅtt</string>
- <string id="30004">MinÅség (újraindÃtás szükséges)</string>
- <string id="30005">quicktime-HD</string>
- <string id="30006">quicktime-nagy</string>
- <string id="30007">quicktime-alacsony</string>
- <string id="30008">wmv-nagy</string>
- <string id="30009">wmv-alacsony</string>
- <string id="30010">xvid-magas</string>
- <string id="30011">xvid-alacsony</string>
- <string id="30012">FrissÃtés elérhetÅ itt:</string>
- <string id="30013">Jelenlegi verzió: </string>
- <string id="30014">FrissÃtett verzió: </string>
- <string id="30015">Letöltés</string>
- <string id="30016">Fájlnév: </string>
- <string id="30017">Letöltés & Lejátszás</string>
- <string id="30018">Adatfolyam</string>
- <string id="30019">Kilépés</string>
- <string id="30020">FrissÃtések keresése</string>
- <string id="30021">Ãgy tűnik nincs epizód ebben a formátumban.</string>
- <string id="30022">Változtass a minÅségi beállÃtásokon.</string>
+ <string id="30000">MinÅség (újraindÃtás szükséges)</string>
+ <string id="30001">Ãgy tűnik nincs epizód ebben a formátumban.</string>
+ <string id="30002">Változtass a minÅségi beállÃtásokon.</string>
+ <string id="30003">quicktime-high-definition</string>
+ <string id="30004">quicktime-large</string>
+ <string id="30005">quicktime-small</string>
+ <string id="30006">wmv-large</string>
+ <string id="30007">wmv-small</string>
+ <string id="30008">xvid-large</string>
+ <string id="30009">xvid-small</string>
</strings>
diff --git a/plugin.video.revision3/resources/language/Swedish/strings.xml
b/plugin.video.revision3/resources/language/Swedish/strings.xml
index e18bdd8..d7e27f8 100644
--- a/plugin.video.revision3/resources/language/Swedish/strings.xml
+++ b/plugin.video.revision3/resources/language/Swedish/strings.xml
@@ -1,27 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
- <string id="30000">Använd DVD-spelaren istället för den vanliga
spelaren</string>
- <string id="30001">Ladda ner och spela video</string>
- <string id="30002">Nedladdningssökväg</string>
- <string id="30003">Fråga om nedladdning innan uppspelning</string>
- <string id="30004">Videokvalitet (omstart krävs)</string>
- <!-- Don't translate the quality, it breaks the plugin -->
- <string id="30005">quicktime-high-definition</string>
- <string id="30006">quicktime-large</string>
- <string id="30007">quicktime-small</string>
- <string id="30008">wmv-large</string>
- <string id="30009">wmv-small</string>
- <string id="30010">xvid-large</string>
- <string id="30011">xvid-small</string>
- <string id="30012">Uppdateringar finns på</string>
- <string id="30013">Nuvarande version: </string>
- <string id="30014">Uppdatera version: </string>
- <string id="30015">Nedladdning</string>
- <string id="30016">Filnamn: </string>
- <string id="30017">Hämta & Spela</string>
- <string id="30018">Stream</string>
- <string id="30019">Utgång</string>
- <string id="30020">Söka efter uppdateringar</string>
- <string id="30021">Det verkar inte finns några episoder finns i</string>
- <string id="30022"> format. Ãndra kvalitet inställningar.</string>
+ <string id="30000">Videokvalitet (omstart krävs)</string>
+ <string id="30001">Det verkar inte finns några episoder finns i</string>
+ <string id="30002"> format. Ãndra kvalitet inställningar.</string>
+ <string id="30003">quicktime-high-definition</string>
+ <string id="30004">quicktime-large</string>
+ <string id="30005">quicktime-small</string>
+ <string id="30006">wmv-large</string>
+ <string id="30007">wmv-small</string>
+ <string id="30008">xvid-large</string>
+ <string id="30009">xvid-small</string>
</strings>
diff --git a/plugin.video.revision3/resources/settings.xml
b/plugin.video.revision3/resources/settings.xml
index bdee278..3016b8b 100644
--- a/plugin.video.revision3/resources/settings.xml
+++ b/plugin.video.revision3/resources/settings.xml
@@ -1,8 +1,3 @@
<settings>
- <setting id="update" type="bool" label="30020" default="true"/>
- <setting id="dvdplayer" type="bool" label="30000" default="false"/>
- <setting id="download" type="bool" label="30001" default="false"/>
- <setting id="download_path" type="folder" enable="eq(-1,true)"
source="files" label="30002" option="writeable" default="E:\"/>
- <setting id="download_ask" type="bool" enable="eq(-2,false)" label="30003"
default="false"/>
- <setting id="quality" type="enum"
lvalues="30005|30006|30007|30008|30009|30010|30011" label="30004" default="5"/>
+ <setting id="quality" type="select"
lvalues="30003|30004|30005|30006|30007|30008|30009" label="30000"
default="quicktime-high-definition"/>
</settings>
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 +-
plugin.video.escapistmagazine/addon.xml | 4 +-
plugin.video.escapistmagazine/changelog.txt | 4 +
plugin.video.revision3/addon.xml | 2 +-
plugin.video.revision3/changelog.txt | 5 +
plugin.video.revision3/default.py | 96 ++++----------------
.../resources/language/English/strings.xml | 33 ++-----
.../resources/language/Finnish/strings.xml | 36 +++-----
.../resources/language/Hungarian/strings.xml | 33 ++-----
.../resources/language/Swedish/strings.xml | 34 ++-----
plugin.video.revision3/resources/settings.xml | 7 +--
plugin.video.xbmcflicks/addon.xml | 2 +-
plugin.video.xbmcflicks/changelog.txt | 3 +-
.../resources/language/English/strings.xml | 1 +
.../resources/language/Finnish/strings.xml | 1 +
.../resources/language/German/strings.xml | 1 +
.../resources/language/Polish/strings.xml | 1 +
.../resources/language/Swedish/strings.xml | 1 +
plugin.video.xbmcflicks/resources/lib/Netflix.py | 31 +++++--
plugin.video.xbmcflicks/resources/lib/iqueue.py | 10 ++-
plugin.video.xbmcflicks/resources/lib/menu.py | 16 +++-
plugin.video.xbmcflicks/resources/lib/settings.py | 9 ++
plugin.video.xbmcflicks/resources/settings.xml | 1 +
23 files changed, 134 insertions(+), 199 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
