The branch, frodo has been updated
via 6939dae4e8ada846aaf2ddf23a27c8014a1a67e6 (commit)
from 73ddeecf163c9aa6f47998209ee7f795f1996321 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=6939dae4e8ada846aaf2ddf23a27c8014a1a67e6
commit 6939dae4e8ada846aaf2ddf23a27c8014a1a67e6
Author: beenje <[email protected]>
Date: Fri Nov 23 22:54:59 2012 +0100
[plugin.video.filmon] updated to version 3.1.9
diff --git a/plugin.video.filmon/addon.xml b/plugin.video.filmon/addon.xml
index 9595243..09bc184 100644
--- a/plugin.video.filmon/addon.xml
+++ b/plugin.video.filmon/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.filmon"
name="FilmON"
- version="3.1.8"
+ version="3.1.9"
provider-name="FilmOn.TV Networks Inc">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/plugin.video.filmon/changelog.txt
b/plugin.video.filmon/changelog.txt
index 3100a9f..f828965 100644
--- a/plugin.video.filmon/changelog.txt
+++ b/plugin.video.filmon/changelog.txt
@@ -1,3 +1,7 @@
+V3.1.9
+Added Auto Select Stream Resolution
+Clean Up Code
+
v3.1.8
Added Languages
Added If Subscribed High Stream Will Automatically Play
diff --git a/plugin.video.filmon/default.py b/plugin.video.filmon/default.py
index c796e06..900c61c 100644
--- a/plugin.video.filmon/default.py
+++ b/plugin.video.filmon/default.py
@@ -92,11 +92,11 @@ ses = xbmcgui.Window(10000).getProperty("SessionID")
-def CATEGORIES():
+def GROUPS():
if ADDON.getSetting('filmon') == 'true':
-
addDir(language(30059),'url',5,'http://www.filmon.com/tv/themes/filmontv/img/mobile/filmon-logo-stb.png','','','','','','','','')
+
ADD_DIRECTORY_ITEM(language(30059),'url',5,'http://www.filmon.com/tv/themes/filmontv/img/mobile/filmon-logo-stb.png','','','','','','','','')
if ADDON.getSetting('filmon') == 'true':
-
addDir(language(30060),'url',9,'http://www.filmon.com/tv/themes/filmontv/images/category/favorites_stb.png','','','','','','','','')
+
ADD_DIRECTORY_ITEM(language(30060),'url',9,'http://www.filmon.com/tv/themes/filmontv/images/category/favorites_stb.png','','','','','','','','')
grp='http://www.filmon.com/api/groups?session_key=%s' % (ses)
link = net.http_GET(grp).content
data = json.loads(link)
@@ -104,10 +104,10 @@ def CATEGORIES():
url = field['group_id']
name = field['group']
iconimage= field['logo_148x148_uri']
- addDir(name,url,3,iconimage,'','','','','','','','')
+
ADD_DIRECTORY_ITEM(name,url,3,iconimage,'','','','','','','','')
setView('tvshows', 'default')
-def Channels(name,url):
+def CHANNELS(name,url):
if ADDON.getSetting('firstrun') == 'false':
dialog = xbmcgui.Dialog()
if
dialog.yesno(language(30021),language(30022),'',language(30023),language(30024),language(30025)):
@@ -141,7 +141,7 @@ def Channels(name,url):
except:
dialog.ok(language(30021),
language(30029), language(30030),language(30031))
try:
- country=settings.country()
+ country=settings.RETURN_COUNTRIES(url)
city = ''
keyboard = xbmc.Keyboard('',
language(30309))
keyboard.doModal()
@@ -195,18 +195,22 @@ def Channels(name,url):
iconimage = str(icon).replace('/logo','/extra_big_logo')
description = ''
name = name.encode("utf-8")
-
addDir(name,url,2,iconimage,description,'favorites','','','','tvguide','','')
+
ADD_DIRECTORY_ITEM(name,url,2,iconimage,description,'favorites','','','','tvguide','','')
setView('episodes', 'default')
-def getStream(channels,resolution,watch_timeout):
+def GET_STREAM_RESOLUTION(channels,resolution,watch_timeout):
watch_timeout=str(watch_timeout)
if resolution == '0':
quality = 'LOW'
+
+ if resolution == '1':
+ quality = 'HIGH'
+
+ if resolution == '2':
+ quality = 'LOW'
if len(watch_timeout)>5:
quality = 'HIGH'
- else:
- quality = 'HIGH'
for item in channels:
if item['quality'].upper() == quality:
@@ -214,13 +218,13 @@ def getStream(channels,resolution,watch_timeout):
return None
-def FilmOn(url,iconimage):
+def GET_STREAMS(url,iconimage):
url='http://www.filmon.com/api/channel/%s?session_key=%s' % (url,ses)
link = net.http_GET(url).content
data = json.loads(link)
channels= data['streams']
watch_timeout= data['watch-timeout']
- stream = getStream(channels,resolution,watch_timeout)
+ stream = GET_STREAM_RESOLUTION(channels,resolution,watch_timeout)
if stream is not None:
foregex= stream['url']+'<'
playpath=stream['name']
@@ -240,11 +244,11 @@ def FilmOn(url,iconimage):
pageUrl = 'http://www.filmon.com/'
url= str(url)+' playpath='+str(playpath)+' app='+str(app)+'
swfUrl='+str(swfUrl)+' tcUrl='+str(tcUrl)+' pageurl='+str(pageUrl)
xbmc.Player(xbmc.PLAYER_CORE_DVDPLAYER).play(url)
- addLink(name,url,iconimage,'','','','','','','','')
+ ADD_STREAM_LINK(name,url,iconimage,'','','','','','','','')
setView('movies', 'default')
-def MyRecordings(url):
+def GET_RECORDINGS(url):
url='http://www.filmon.com/api/dvr-list?session_key=%s'%(ses)
link = net.http_GET(url).content
data = json.loads(link)
@@ -277,26 +281,26 @@ def MyRecordings(url):
status=language(30050)
name='%s %s' %(status,name)
name = name.encode('utf-8')
-
addLink(name,url,iconimage,description,'','','','delete','','',rec)
+
ADD_STREAM_LINK(name,url,iconimage,description,'','','','delete','','',rec)
if status=='Accepted':
status=language(30051)
name='%s %s' %(status,name)
name = name.encode('utf-8')
-
addLink(name,url,iconimage,description,'','','','delete','','',rec)
+
ADD_STREAM_LINK(name,url,iconimage,description,'','','','delete','','',rec)
if status=='Recording':
status=language(30052)
name='%s %s' %(status,name)
name = name.encode('utf-8')
-
addLink(name,url,iconimage,description,'','','','delete','','',rec)
+
ADD_STREAM_LINK(name,url,iconimage,description,'','','','delete','','',rec)
if status=='Failed':
status=language(30053)
name='%s %s' %(status,name)
name = name.encode('utf-8')
-
addLink(name,url,iconimage,description,'','','','delete','','',rec)
+
ADD_STREAM_LINK(name,url,iconimage,description,'','','','delete','','',rec)
setView('movies', 'epg')
-def Record(url,programme_id,startdate_time):
+def RECORD_PROGRAMME(url,programme_id,startdate_time):
url
='http://filmon.com/api/dvr-add?session_key=%s&channel_id=%s&programme_id=%s&start_time=%s'
% (ses,url,programme_id,startdate_time)
link = net.http_GET(url).content
try:
@@ -311,7 +315,7 @@ def Record(url,programme_id,startdate_time):
dialog = xbmcgui.Dialog()
dialog.ok(language(30021),language(3004),language(30043),language(30044))
-def Delete(startdate_time):
+def DELETE_RECORDING(startdate_time):
url='http://www.filmon.com/api/dvr-remove?session_key=%s&recording_id=%s'%(ses,startdate_time)
try:
link = net.http_GET(url).content
@@ -325,7 +329,7 @@ def Delete(startdate_time):
dialog = xbmcgui.Dialog()
dialog.ok(language(30021),'',language(30047),'')
-def EPG(url,iconimage):
+def TV_GUIDE(url,iconimage):
url= 'http://www.filmon.com/api/channel/%s?session_key=%s' %
(url,ses)
link = net.http_GET(url).content
data = json.loads(link)
@@ -349,10 +353,10 @@ def EPG(url,iconimage):
name = name.encode('utf-8')
description = desc.encode('utf-8')
url =str(cid)
-
addDir(name,url,2,iconimage,description,'','','record','','',programme_id,startdate_time)
+
ADD_DIRECTORY_ITEM(name,url,2,iconimage,description,'','','record','','',programme_id,startdate_time)
setView('movies', 'epg')
-def channel_dict(url):
+def RETURN_CHANNEL_NAME_FAVOURITES(url):
r='http://www.filmon.com/api/channel/%s?session_key=%s'%(url,ses)
link = net.http_GET(r).content
data=json.loads(link)
@@ -360,7 +364,7 @@ def channel_dict(url):
name=name.encode('utf-8')
return name
-def FAV(url):
+def GET_FAVOURITES(url):
grp='http://www.filmon.com/api/favorites?session_key=%s&run=get'% (ses)
link = net.http_GET(grp).content
data=json.loads(link)
@@ -368,17 +372,17 @@ def FAV(url):
for field in result:
url=field['channel_id']
iconimage='http://static.filmon.com/couch/channels/%s/extra_big_logo.png'%(url)
- name=channel_dict(url)
- addDir(name,url,2,iconimage,'','','delete','','','tvguide','','')
+ name=RETURN_CHANNEL_NAME_FAVOURITES(url)
+
ADD_DIRECTORY_ITEM(name,url,2,iconimage,'','','delete','','','tvguide','','')
setView('movies', 'default')
-def favourite(url):
+def ADD_FAVOURITES(url):
dialog = xbmcgui.Dialog()
grp='http://www.filmon.com/api/favorites?session_key=%s&channel_id=%s&run=add'%(ses,url)
link = net.http_GET(grp).content
dialog.ok(language(30021),language(30048),' ','')
-def deletefavourite(url):
+def DELETE_FAVOURITES(url):
dialog = xbmcgui.Dialog()
grp='http://www.filmon.com/api/favorites?session_key=%s&channel_id=%s&run=remove'%(ses,url)
link = net.http_GET(grp).content
@@ -403,7 +407,7 @@ def get_params():
return param
-def addDir(name,url,mode,iconimage,description, favorites, deletefav, record,
deleterecord, tvguide,programme_id,startdate_time):
+def ADD_DIRECTORY_ITEM(name,url,mode,iconimage,description, favorites,
deletefav, record, deleterecord, tvguide,programme_id,startdate_time):
u=sys.argv[0]+"?url="+urllib.quote_plus(url)+"&mode="+str(mode)+"&name="+urllib.quote_plus(name)+"&iconimage="+urllib.quote_plus(iconimage)+"&description="+urllib.quote_plus(description)+"&programme_id="+urllib.quote_plus(programme_id)+"&startdate_time="+urllib.quote_plus(startdate_time)
ok=True
liz=xbmcgui.ListItem(name,
iconImage="DefaultFolder.png",thumbnailImage=iconimage)
@@ -427,7 +431,7 @@ def addDir(name,url,mode,iconimage,description, favorites,
deletefav, record, de
ok=xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=liz,isFolder=True)
return ok
-def addLink(name,url,iconimage,description, favorites, deletefav, record,
deleterecord,tvguide,programme_id,startdate_time):
+def ADD_STREAM_LINK(name,url,iconimage,description, favorites, deletefav,
record, deleterecord,tvguide,programme_id,startdate_time):
ok=True
liz=xbmcgui.ListItem(name, iconImage="DefaultVideo.png",
thumbnailImage=iconimage)
liz.setInfo( type="Video", infoLabels={ "Title": name, "Plot":
description } )
@@ -512,15 +516,15 @@ print "IconImage: "+str(iconimage)
if mode==None or url==None or len(url)<1:
print ""
- CATEGORIES()
+ GROUPS()
elif mode==2:
print ""+url
- FilmOn(url,iconimage)
+ GET_STREAMS(url,iconimage)
elif mode==3:
print ""+url
- Channels(name,url)
+ CHANNELS(name,url)
elif mode==4:
print ""+url
@@ -528,31 +532,31 @@ elif mode==4:
elif mode==5:
print ""+url
- MyRecordings(url)
+ GET_RECORDINGS(url)
elif mode==6:
print ""+url
- Record(url,programme_id,startdate_time)
+ RECORD_PROGRAMME(url,programme_id,startdate_time)
elif mode==7:
print ""+url
- Delete(startdate_time)
+ DELETE_RECORDING(startdate_time)
elif mode==8:
print ""+url
- EPG(url,iconimage)
+ TV_GUIDE(url,iconimage)
elif mode==9:
print ""+url
- FAV(url)
+ GET_FAVOURITES(url)
elif mode==10:
print ""+url
- favourite(url)
+ ADD_FAVOURITES(url)
elif mode==11:
print ""+url
- deletefavourite(url)
+ DELETE_FAVOURITES(url)
xbmcplugin.endOfDirectory(int(sys.argv[1]))
diff --git a/plugin.video.filmon/resources/language/english/strings.xml
b/plugin.video.filmon/resources/language/english/strings.xml
index 2ba66a8..9acb1f1 100644
--- a/plugin.video.filmon/resources/language/english/strings.xml
+++ b/plugin.video.filmon/resources/language/english/strings.xml
@@ -12,7 +12,8 @@
<string id="30015">EPG View</string>
<string id="30016">EVERY THING ELSE</string>
<string id="30017">LOW</string>
- <string id="30018">HIGH</string>
+ <string id="30018">HIGH</string>
+ <string id="30310">AUTO SELECTED</string>
<string id="30019">FilmOn Settings</string>
<string id="30020">Auto-View</string>
diff --git a/plugin.video.filmon/resources/settings.xml
b/plugin.video.filmon/resources/settings.xml
index 87c56c8..37a4180 100644
--- a/plugin.video.filmon/resources/settings.xml
+++ b/plugin.video.filmon/resources/settings.xml
@@ -5,7 +5,7 @@
<setting id="user" type="text" label="30011" default=""
enable="!eq(-1,false)"/>
<setting id="pass" type="text" option="hidden" label="30012" default=""
enable="!eq(-2,false)"/>
<setting type="sep" />
- <setting id="res" type="enum" lvalues="30017|30018" label="30013"
default="0" />
+ <setting id="res" type="enum" lvalues="30017|30018|30310" label="30013"
default="0" />
<setting type="sep" />
<setting id="firstrun" type="bool" label="DO NOT TOUCH" default="false"
visible="false"/>
</category>
diff --git a/plugin.video.filmon/settings.py b/plugin.video.filmon/settings.py
index ed7b5ff..f20d7c5 100644
--- a/plugin.video.filmon/settings.py
+++ b/plugin.video.filmon/settings.py
@@ -7,7 +7,7 @@ language = ADDON.getLocalizedString
-def country():
+def RETURN_COUNTRIES(url):
dialog = xbmcgui.Dialog()
countries =
[language(30061),language(30062),language(30063),language(30064),language(30065),language(30066),language(30067),language(30068),language(30069),language(30070),language(30071),language(30072),language(30073),language(30074),language(30075),language(30076),language(30077),language(30078),language(30079),language(30080),language(30081),language(30082),language(30083),language(30084),language(30085),language(30086),language(30087),language(30088),language(30089),language(30090),language(30091),language(30092),language(30093),language(30094),language(30095),language(30096),language(30097),language(30098),language(30099),language(30100),language(30101),language(30102),language(30103),language(30104),language(30105),language(30106),language(30107),language(30108),language(30109),language(30110),language(30111),language(30112),language(30113),language(30114),language(30115),language(30116),language(30117),language(30118),language(30119),language(30120),language(30121),language(30122),language(30123),language(30124),language(30125),language(30126),language(30127),language(30128),language(30129),language(30130),language(30131),language(30132),language(30133),language(30134),language(30135),language(30136),language(30137),language(30138),language(30139),language(30140),language(30141),language(30142),language(30143),language(30144),language(30145),language(30146),language(30147),language(30148),language(30149),language(30150),language(30151),language(30152),language(30153),language(30154),language(30155),language(30156),language(30157),language(30158),language(30159),language(30160),language(30161),language(30162),language(30163),language(30164),language(30165),language(30166),language(30167),language(30168),language(30169),language(30170),language(30171),language(30172),language(30173),language(30174),language(30175),language(30176),language(30177),language(30178),language(30179),language(30180),language(30181),language(30182),language(30183),language(30184),language(30185),language(30186),language(30187),l anguage(30188),language(30189),language(30190),language(30191),language(30192),language(30193),language(30194),language(30195),language(30196),language(30197),language(30198),language(30199),language(30200),language(30201),language(30202),language(30203),language(30204),language(30205),language(30206),language(30207),language(30208),language(30209),language(30210),language(30211),language(30212),language(30213),language(30214),language(30215),language(30216),language(30217),language(30218),language(30219),language(30220),language(30221),language(30222),language(30223),language(30224),language(30225),language(30226),language(30227),language(30228),language(30229),language(30230),language(30231),language(30232),language(30233),language(30234),language(30235),language(30236),language(30237),language(30238),language(30239),language(30240),language(30241),language(30242),language(30243),language(30244),language(30245),language(30246),language(30247),language(30248),language(30249),language(30250),language(30251),language(30252),language(30253),language(30254),language(30255),language(30256),language(30257),language(30258),language(30259),language(30260),language(30261),language(30262),language(30263),language(30264),language(30265),language(30266),language(30267),language(30268),language(30269),language(30270),language(30271),language(30272),language(30273),language(30274),language(30275),language(30276),language(30277),language(30278),language(30279),language(30280),language(30281),language(30282),language(30283),language(30284),language(30285),language(30286),language(30287),language(30288),language(30289),language(30290),language(30291),language(30292),language(30293),language(30294),language(30295),language(30296),language(30297),language(30298),language(30299),language(30300),language(30301),language(30302),language(30303),language(30304),language(30305)]
countriesAbbr=['AF','AL','DZ','AS','AD','AO','AI','AQ','AG','AR','AM','AW','AU','AT','AZ','AX','BS','BH','BD','BB','BY','BE','BZ','BJ','BM','BT','BO','BA','BW','BV','BR','IO','BN','BG','BF','BI','KH','CM','CA','CV','CW','KY','CF','TD','CL','CN','CX','CC','CO','KM','CG','CD','CK','CR','CI','HR','CU','CY','CZ','DK','DJ','DM','DO','EU','EC','EG','SV','GQ','ER','EE','ET','FK','FO','FJ','FI','FR','GF','PF','TF','GA','GM','GE','DE','GH','GI','GR','GL','GD','GP','GU','GT','GN','GW','GY','HT','HM','VA','HN','HK','HU','IS','IN','ID','IR','IQ','IE','IL','IT','JM','JP','JO','KZ','KE','KI','KP','KR','KW','KG','LA','LV','LB','LS','LR','LY','LI','LT','LU','MO','MK','MG','MW','MY','MV','ML','MT','MH','MQ','MR','MU','YT','MX','FM','MD','ME','MC','MN','MS','MA','MZ','MM','NA','NR','NP','NL','AN','NC','NZ','NI','NE','NG','NU','NF','MP','NO','OM','PK','PW','PS','PA','PG','PY','PE','PH','PN','PL','PT','PR','QA','RE','RO','RS','RU','RW','SH','KN','LC','PM','VC','WS','SM','ST','SA','SN','CS','SC','SL','SG','SK','SI','SB','SO','ZA','GS','ES','LK','SD','SR','SJ','SZ','SE','CH','SY','TW','TJ','TZ','TH','TL','TG','TK','TO','TT','TN','TR','TM','TC','TV','UG','UA','AE','GB','UK','US','UM','UY','UZ','VU','VE','VN','VG','VI','WF','EH','YE','ZM','ZW']
-----------------------------------------------------------------------
Summary of changes:
plugin.video.filmon/addon.xml | 2 +-
plugin.video.filmon/changelog.txt | 4 +
plugin.video.filmon/default.py | 84 ++++++++++---------
.../resources/language/english/strings.xml | 3 +-
plugin.video.filmon/resources/settings.xml | 2 +-
plugin.video.filmon/settings.py | 2 +-
6 files changed, 53 insertions(+), 44 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
