The branch, gotham has been updated
via f9ae5463ced1507c2194105c84be38b503242821 (commit)
via 5254d6123266664dddb372b7e9fa02d5c9719994 (commit)
from d8c3b8b72f200535a31be1a90cb4560f622794af (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=f9ae5463ced1507c2194105c84be38b503242821
commit f9ae5463ced1507c2194105c84be38b503242821
Author: Martijn Kaijser <[email protected]>
Date: Thu Sep 18 19:32:39 2014 +0200
[plugin.video.svtplay] 4.0.6
diff --git a/plugin.video.svtplay/addon.xml b/plugin.video.svtplay/addon.xml
index 8ecef17..00cb1b3 100644
--- a/plugin.video.svtplay/addon.xml
+++ b/plugin.video.svtplay/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.svtplay"
name="SVT Play"
- version="4.0.5"
+ version="4.0.6"
provider-name="nilzen">
<requires>
<import addon="script.module.parsedom" version="1.2.0"/>
diff --git a/plugin.video.svtplay/changelog.txt
b/plugin.video.svtplay/changelog.txt
index 77ef623..d2607e0 100644
--- a/plugin.video.svtplay/changelog.txt
+++ b/plugin.video.svtplay/changelog.txt
@@ -1,3 +1,7 @@
+Version 4.0.6
+-------------
+- Fix broken listing due to site change
+
Version 4.0.5
-------------
- Fix broken favorites feature on Windows
diff --git a/plugin.video.svtplay/default.py b/plugin.video.svtplay/default.py
index a22b1da..50fed7f 100644
--- a/plugin.video.svtplay/default.py
+++ b/plugin.video.svtplay/default.py
@@ -22,14 +22,12 @@ MODE_PROGRAM = "pr"
MODE_CLIPS = "clips"
MODE_LIVE_PROGRAMS = "live-channels"
MODE_LATEST = "ep"
-MODE_LATEST_NEWS = "en"
MODE_POPULAR = "popular"
MODE_LAST_CHANCE = "last-chance"
MODE_VIDEO = "video"
MODE_CATEGORIES = "categories"
MODE_CATEGORY = "ti"
MODE_LETTER = "letter"
-MODE_RECOMMENDED = "rp"
MODE_SEARCH = "search"
MODE_BESTOF_CATEGORIES = "bestofcategories"
MODE_BESTOF_CATEGORY = "bestofcategory"
@@ -173,7 +171,7 @@ def viewEpisodes(url):
"""
episodes = svt.getEpisodes(url)
if not episodes:
- common.log("No episodes found!")
+ helper.errorMsg("No episodes found!")
return
for episode in episodes:
@@ -194,7 +192,7 @@ def viewClips(url):
"""
clips = svt.getClips(url)
if not clips:
- common.log("No clips found!")
+ helper.errorMsg("No clips found!")
return
for clip in clips:
@@ -206,7 +204,7 @@ def viewSearch():
viewStart()
return
keyword = urllib.quote(keyword)
- common.log("Search string: " + keyword)
+ helper.infoMsg("Search string: " + keyword)
keyword = re.sub(r" ", "+", keyword)
@@ -319,7 +317,7 @@ def addDirectoryItem(title, params, thumbnail = None,
folder = True, live = Fals
plm_script =
"special://home/addons/plugin.video.svtplay/resources/lib/PlaylistManager.py"
plm_action = "add"
if not thumbnail:
- thumbnail= ""
+ thumbnail = ""
li.addContextMenuItems(
[
(
diff --git a/plugin.video.svtplay/resources/lib/FavoritesManager.py
b/plugin.video.svtplay/resources/lib/FavoritesManager.py
index e0d50fb..fbced9a 100644
--- a/plugin.video.svtplay/resources/lib/FavoritesManager.py
+++ b/plugin.video.svtplay/resources/lib/FavoritesManager.py
@@ -12,8 +12,6 @@ FILE_PATH =
xbmc.translatePath("special://profile/addon_data/%s/favorites.json"
FAVORITES = {}
-log = common.log
-
def add(title, url):
global FAVORITES
__load_from_disk()
@@ -76,18 +74,18 @@ def __load_from_disk():
if os.path.exists(FILE_PATH) and os.stat(FILE_PATH).st_size != 0:
with open(FILE_PATH, "r") as file_handle:
FAVORITES = json.load(file_handle)
- log("Load from disk: "+str(FAVORITES))
+ helper.infoMsg("Load from disk: "+str(FAVORITES))
def __save_to_disk():
- log("Save to disk: "+str(FAVORITES))
+ helper.infoMsg("Save to disk: "+str(FAVORITES))
with open(FILE_PATH, "w") as file_handle:
file_handle.write(json.dumps(FAVORITES))
# To support XBMC.RunScript
if __name__ == "__main__":
- log("FM called as script!")
+ helper.infoMsg("FM called as script!")
if len(sys.argv) < 2:
- log("No argument given!")
+ helper.errorMsg("No argument given!")
else:
if sys.argv[1] == "add" and len(sys.argv) > 3:
add(sys.argv[2], sys.argv[3])
diff --git a/plugin.video.svtplay/resources/lib/PlaylistManager.py
b/plugin.video.svtplay/resources/lib/PlaylistManager.py
index 6fbc0f3..6ba88f0 100644
--- a/plugin.video.svtplay/resources/lib/PlaylistManager.py
+++ b/plugin.video.svtplay/resources/lib/PlaylistManager.py
@@ -8,8 +8,6 @@ import CommonFunctions as common
import svt
import helper
-log = common.log
-
__playlist = xbmc.PlayList(xbmc.PLAYLIST_VIDEO)
def add(url, title, thumbnail):
@@ -68,9 +66,9 @@ def __get_video_url(url):
# To support XBMC.RunScript
if __name__ == "__main__":
- log("PLM called as script!")
+ helper.infoMsg("PLM called as script!")
if len(sys.argv) < 2:
- log("No argument given!")
+ helper.infoMsg("No argument given!")
else:
if sys.argv[1] == "add" and len(sys.argv) > 4:
add(sys.argv[2], sys.argv[3], sys.argv[4])
diff --git a/plugin.video.svtplay/resources/lib/helper.py
b/plugin.video.svtplay/resources/lib/helper.py
index 902a9a7..cee2c1c 100644
--- a/plugin.video.svtplay/resources/lib/helper.py
+++ b/plugin.video.svtplay/resources/lib/helper.py
@@ -363,3 +363,9 @@ def getVideoExtension(video_url):
def getSetting(setting):
return True if addon.getSetting(setting) == "true" else False
+
+def errorMsg(msg):
+ common.log("Error: "+msg)
+
+def infoMsg(msg):
+ common.log("Info: "+msg)
diff --git a/plugin.video.svtplay/resources/lib/svt.py
b/plugin.video.svtplay/resources/lib/svt.py
index 67811dc..d3c1a7e 100644
--- a/plugin.video.svtplay/resources/lib/svt.py
+++ b/plugin.video.svtplay/resources/lib/svt.py
@@ -82,13 +82,13 @@ def getProgramsForCategory(url):
container = common.parseDOM(html, "div", attrs = { "id" :
"[^\"']*playJs-alphabetic-list[^\"']*" })
if not container:
- common.log("Could not find container for URL "+url)
+ helper.errorMsg("Could not find container for URL "+url)
return None
articles = common.parseDOM(container, "article", attrs = { "class" :
"[^\"']*play_videolist-element[^\"']*" })
if not articles:
- common.log("Could not find program links for URL "+url)
+ helper.errorMsg("Could not find program links for URL "+url)
return None
programs = []
@@ -108,16 +108,16 @@ def getAlphas():
Returns a list of all letters in the alphabet that has programs.
"""
html = getPage(URL_A_TO_O)
- container = common.parseDOM(html, "ul", attrs = { "class" :
"[^\"']*play_alphabetic-list-titles[^\"']*" })
+ container = common.parseDOM(html, "ul", attrs = { "class" :
"[^\"']*play_alphabetic-list[^\"']*" })
if not container:
- common.log("No container found!")
+ helper.errorMsg("No container found!")
return None
- letters = common.parseDOM(container[0], "h3", attrs = { "class" :
"[^\"']*play_alphabetic-letter--title[^\"']*" })
+ letters = common.parseDOM(container[0], "h3", attrs = { "class" :
"[^\"']*play_alphabetic-list__letter[^\"']*" })
if not letters:
- common.log("Could not find any letters!")
+ helper.errorMsg("Could not find any letters!")
return None
alphas = []
@@ -139,9 +139,9 @@ def getProgramsByLetter(letter):
html = getPage(URL_A_TO_O)
- letterboxes = common.parseDOM(html, "li", attrs = { "class":
"[^\"']*play_alphabetic-letter[^\"']*" })
+ letterboxes = common.parseDOM(html, "li", attrs = { "class":
"[^\"']*play_alphabetic-list[^\"']*" })
if not letterboxes:
- common.log("No containers found for letter '%s'" % letter)
+ helper.errorMsg("No containers found for letter '%s'" % letter)
return None
letterbox = None
@@ -155,7 +155,7 @@ def getProgramsByLetter(letter):
lis = common.parseDOM(letterbox, "li", attrs = { "class":
"[^\"']*play_js-filterable-item[^\"']*" })
if not lis:
- common.log("No items found for letter '"+letter+"'")
+ helper.errorMsg("No items found for letter '"+letter+"'")
return None
programs = []
@@ -182,7 +182,7 @@ def getSearchResults(url):
for list_id in [SEARCH_LIST_TITLES, SEARCH_LIST_EPISODES, SEARCH_LIST_CLIPS]:
items = getSearchResultsForList(html, list_id)
if not items:
- common.log("No items in list '"+list_id+"'")
+ helper.errorMsg("No items in list '"+list_id+"'")
continue
results.extend(items)
@@ -197,12 +197,12 @@ def getSearchResultsForList(html, list_id):
"""
container = common.parseDOM(html, "div", attrs = { "id" : list_id })
if not container:
- common.log("No container found for list ID '"+list_id+"'")
+ helper.errorMsg("No container found for list ID '"+list_id+"'")
return None
articles = common.parseDOM(container, "article")
if not articles:
- common.log("No articles found for list ID '"+list_id+"'")
+ helper.errorMsg("No articles found for list ID '"+list_id+"'")
return None
titles = common.parseDOM(container, "article", ret = "data-title")
@@ -230,7 +230,7 @@ def getChannels():
container = common.parseDOM(html, "ul", attrs = { "data-tabarea" :
"ta-schedule"})
if not container:
- common.log("No container found for channels")
+ helper.errorMsg("No container found for channels")
return None
channels = []
@@ -299,7 +299,7 @@ def getArticles(section_name, url=None):
container = common.parseDOM(html, "div", attrs = { "class" :
video_list_class, "id" : section_name })
if not container:
- common.log("No container found for section "+section_name+"!")
+ helper.errorMsg("No container found for section "+section_name+"!")
return None
container = container[0]
@@ -314,7 +314,7 @@ def getArticles(section_name, url=None):
new_articles = []
if not articles:
- common.log("No articles found for section '"+section_name+"' !")
+ helper.errorMsg("No articles found for section '"+section_name+"' !")
return None
for index, article in enumerate(articles):
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=5254d6123266664dddb372b7e9fa02d5c9719994
-----------------------------------------------------------------------
Summary of changes:
.../LICENSE.txt | 0
plugin.video.nbcsnliveextra/README.md | 7 +
plugin.video.nbcsnliveextra/addon.xml | 23 ++
plugin.video.nbcsnliveextra/changelog.txt | 2 +
plugin.video.nbcsnliveextra/fanart.jpg | Bin 0 -> 200722 bytes
plugin.video.nbcsnliveextra/icon.png | Bin 0 -> 56359 bytes
plugin.video.nbcsnliveextra/nbcsn.py | 217 ++++++++++++++++++++
plugin.video.svtplay/addon.xml | 2 +-
plugin.video.svtplay/changelog.txt | 4 +
plugin.video.svtplay/default.py | 10 +-
.../resources/lib/FavoritesManager.py | 10 +-
.../resources/lib/PlaylistManager.py | 6 +-
plugin.video.svtplay/resources/lib/helper.py | 6 +
plugin.video.svtplay/resources/lib/svt.py | 30 ++--
14 files changed, 285 insertions(+), 32 deletions(-)
copy {plugin.video.amaproracing => plugin.video.nbcsnliveextra}/LICENSE.txt
(100%)
create mode 100644 plugin.video.nbcsnliveextra/README.md
create mode 100644 plugin.video.nbcsnliveextra/addon.xml
create mode 100644 plugin.video.nbcsnliveextra/changelog.txt
create mode 100644 plugin.video.nbcsnliveextra/fanart.jpg
create mode 100644 plugin.video.nbcsnliveextra/icon.png
create mode 100644 plugin.video.nbcsnliveextra/nbcsn.py
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Slashdot TV. Video for Nerds. Stuff that Matters.
http://pubads.g.doubleclick.net/gampad/clk?id=160591471&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
