The branch, dharma has been updated
via cd4dea6b1c011a3b3de6859fa2802ba723a4acf0 (commit)
from 3f799877db2d665610d37425f182aec0a357e630 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=cd4dea6b1c011a3b3de6859fa2802ba723a4acf0
commit cd4dea6b1c011a3b3de6859fa2802ba723a4acf0
Author: spiff <[email protected]>
Date: Wed Jul 20 10:10:06 2011 +0200
[plugin.video.flw.outdoors] updated to version 0.0.3
diff --git a/plugin.video.flw.outdoors/addon.xml
b/plugin.video.flw.outdoors/addon.xml
index 8039a39..b5f09fc 100644
--- a/plugin.video.flw.outdoors/addon.xml
+++ b/plugin.video.flw.outdoors/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.flw.outdoors"
name="FLW Outdoors"
- version="0.0.2"
+ version="0.0.3"
provider-name="divingmule">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.video.flw.outdoors/changelog.txt
b/plugin.video.flw.outdoors/changelog.txt
index 1fab2a5..b78cc2b 100644
--- a/plugin.video.flw.outdoors/changelog.txt
+++ b/plugin.video.flw.outdoors/changelog.txt
@@ -1,3 +1,6 @@
+Version 0.0.3
+fix for website changes
+
Version 0.0.2
fix for website changes
diff --git a/plugin.video.flw.outdoors/default.py
b/plugin.video.flw.outdoors/default.py
index 339b910..00ff900 100644
--- a/plugin.video.flw.outdoors/default.py
+++ b/plugin.video.flw.outdoors/default.py
@@ -1,6 +1,9 @@
import urllib,urllib2,re,os
import xbmcplugin,xbmcgui,xbmcaddon
-import simplejson as json
+try:
+ import json
+except:
+ import simplejson as json
__settings__ = xbmcaddon.Addon(id='plugin.video.flw.outdoors')
__language__ = __settings__.getLocalizedString
@@ -9,50 +12,51 @@ icon = xbmc.translatePath( os.path.join( __home__,
'icon.png' ) )
def CATEGORIES():
- addDir(__language__(30000),'flwlatestvideos',1,icon)
- addDir(__language__(30001),'flwtourtv',1,icon)
- addDir(__language__(30002),'flwseriestv',1,icon)
- addDir(__language__(30003),'collegefishingtv',1,icon)
- addDir(__language__(30004),'forrestwoodcuptv',1,icon)
- addDir(__language__(30005),'walleyetourtv',1,icon)
- addDir(__language__(30006),'bfltv',1,icon)
- addDir(__language__(30007),'tipsfromthepros',1,icon)
- addDir(__language__(30008),'fantasyonflw',1,icon)
- addDir(__language__(30009),'flwpodcast',1,icon)
- addDir(__language__(30010),'flwtour',1,icon)
- addDir(__language__(30011),'collegeonflw',1,icon)
+
addDir(__language__(30000),'http://www.flwoutdoors.com/flwMedia/ajax.cfm?callsign=flwlatestvideos&method=getVideosInChannel',1,icon)
+
addDir(__language__(30001),'http://www.flwoutdoors.com/flwMedia/ajax.cfm?callsign=flwtv&method=getVideosInChannel',1,icon)
+
addDir(__language__(30002),'http://www.flwoutdoors.com/flwMedia/ajax.cfm?callsign=tipsfromthepros&method=getVideosInChannel',1,icon)
+
addDir(__language__(30003),'http://www.flwoutdoors.com/flwMedia/ajax.cfm?callsign=flwtour&method=getVideosInChannel',1,icon)
+
addDir(__language__(30004),'http://www.flwoutdoors.com/flwMedia/ajax.cfm?callsign=fantasyonflw&method=getVideosInChannel',1,icon)
+
addDir(__language__(30005),'http://www.flwoutdoors.com/flwMedia/ajax.cfm?callsign=collegeonflw&method=getVideosInChannel',1,icon)
+
addDir(__language__(30006),'http://www.flwoutdoors.com/flwMedia/ajax.cfm?callsign=flwpodcast&method=getVideosInChannel',1,icon)
+
addDir(__language__(30007),'http://www.flwoutdoors.com/flwMedia/ajax.cfm?callsign=ReelCast&method=getVideosInChannel',1,icon)
+
addDir(__language__(30008),'http://www.flwoutdoors.com/flwMedia/ajax.cfm?callsign=flwmagpublic&method=getVideosInChannel',1,icon)
def INDEX(url):
-
url='http://www.flwoutdoors.com/flwMedia/ajax.cfm?callsign='+url+'&method=getVideosInChannel'
- req = urllib2.Request(url)
- response = urllib2.urlopen(req)
- link=response.read()
- data=json.loads(link)
- videos = data["CHANNEL"]["AFILE"]
- for video in videos:
- title = video["TITLE"]
- path = video["PATH"]
- thumbnail = video["THUMBNAIL"]
- description = video["DESCRIPTION"]
- addLink (title,path,description,thumbnail)
-
+ req = urllib2.Request(url)
+ req.addheaders = [('Referer',
'http://www.flwoutdoors.com/flwondemand.cfm?cs=flwtour'),
+ ('Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US;
rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)')]
+ response = urllib2.urlopen(req)
+ link=response.read()
+ data=json.loads(link)
+ videos = data["CHANNEL"]["AFILE"]
+ for video in videos:
+ title = video["TITLE"]
+ if not video["PATH"]=='':
+ path = video["PATH"]
+ else:
+ path = 'http://www.jidocs.com'+str(video["STREAMING_PATH"])[4:]
+ thumbnail = video["THUMBNAIL"]
+ description = video["DESCRIPTION"]
+ addLink (title,path,description,thumbnail)
+
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]
+ 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
@@ -80,28 +84,29 @@ name=None
mode=None
try:
- url=urllib.unquote_plus(params["url"])
+ url=urllib.unquote_plus(params["url"])
except:
- pass
+ pass
try:
- name=urllib.unquote_plus(params["name"])
+ name=urllib.unquote_plus(params["name"])
except:
- pass
+ pass
try:
- mode=int(params["mode"])
+ mode=int(params["mode"])
except:
- pass
+ pass
print "Mode: "+str(mode)
print "URL: "+str(url)
print "Name: "+str(name)
-if mode==None or url==None or len(url)<1:
- print ""
- CATEGORIES()
+if mode==None:
+ print ""
+ CATEGORIES()
elif mode==1:
- print ""+url
- INDEX(url)
+ print ""+url
+ INDEX(url)
+
xbmcplugin.endOfDirectory(int(sys.argv[1]))
diff --git a/plugin.video.flw.outdoors/resources/language/English/strings.xml
b/plugin.video.flw.outdoors/resources/language/English/strings.xml
index d24beeb..fcd0e96 100644
--- a/plugin.video.flw.outdoors/resources/language/English/strings.xml
+++ b/plugin.video.flw.outdoors/resources/language/English/strings.xml
@@ -1,19 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<string id="30000">FLW Outdoors Latest</string>
- <string id="30001">FLW Tour TV</string>
- <string id="30002">FLW Series TV</string>
- <string id="30003">FLW College TV</string>
- <string id="30004">Forrest Wood Cup TV</string>
- <string id="30005">Walleye Tour TV</string>
- <string id="30006">BFL TV</string>
- <string id="30007">Tips from the Pros</string>
- <string id="30008">Fantasy Fishing</string>
- <string id="30009">Podcast</string>
- <string id="30010">Tour Updates</string>
- <string id="30011">College Fishing</string>
- <string id="30012"></string>
- <string id="30013"></string>
- <string id="30014"></string>
- <string id="30015"></string>
+ <string id="30001">FLW TV</string>
+ <string id="30002">Tips from the Pros</string>
+ <string id="30003">Tour Updates</string>
+ <string id="30004">Fantasy Fishing</string>
+ <string id="30005">College Fishing</string>
+ <string id="30006">Podcast</string>
+ <string id="30007">Reel Cast</string>
+ <string id="30008">Magazine Feature</string>
+ <string id="30009"></string>
</strings>
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
plugin.video.flw.outdoors/addon.xml | 2 +-
plugin.video.flw.outdoors/changelog.txt | 3 +
plugin.video.flw.outdoors/default.py | 101 ++++++++++---------
.../resources/language/English/strings.xml | 24 ++---
4 files changed, 66 insertions(+), 64 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
10 Tips for Better Web Security
Learn 10 ways to better secure your business today. Topics covered include:
Web security, SSL, hacker attacks & Denial of Service (DoS), private keys,
security Microsoft Exchange, secure Instant Messaging, and much more.
http://www.accelacomm.com/jaw/sfnl/114/51426210/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
