The branch, frodo has been updated
via a21bfecd6b9faab2aa8094e8a86b775c81265891 (commit)
via 05a874d113b499564407d5b9b698a49ed187ce8d (commit)
via 81e8f3d0e6a26d9010e568d429546e32b9ab4431 (commit)
from a5723a1de554ba9650f4f703b5be8240977049a1 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=a21bfecd6b9faab2aa8094e8a86b775c81265891
commit a21bfecd6b9faab2aa8094e8a86b775c81265891
Author: beenje <[email protected]>
Date: Wed Apr 10 21:53:05 2013 +0200
[plugin.video.mlbmc] updated to version 2.0.2
diff --git a/plugin.video.mlbmc/addon.xml b/plugin.video.mlbmc/addon.xml
index 15edc87..10feb4f 100644
--- a/plugin.video.mlbmc/addon.xml
+++ b/plugin.video.mlbmc/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.mlbmc"
name="MLBMC"
- version="2.0.1"
+ version="2.0.2"
provider-name="divingmule">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
diff --git a/plugin.video.mlbmc/changelog.txt b/plugin.video.mlbmc/changelog.txt
index 9fbd4c1..4809789 100644
--- a/plugin.video.mlbmc/changelog.txt
+++ b/plugin.video.mlbmc/changelog.txt
@@ -1,3 +1,6 @@
+Version 2.0.2
+fix added missing init file
+
Version 2.0.1
clean up of the previous testing release
diff --git a/plugin.video.mlbmc/resources/settings.xml
b/plugin.video.mlbmc/resources/settings.xml
index 8fa65e5..e4e9124 100644
--- a/plugin.video.mlbmc/resources/settings.xml
+++ b/plugin.video.mlbmc/resources/settings.xml
@@ -1,12 +1,13 @@
-<settings>
+ <settings>
<category label="General">
- <setting id="show_scores" type="bool" label="30012" default="false"/>
- <setting id="debug" type="bool" label="30089" default="false"/>
+ <setting id="show_scores" type="bool" label="30061" default="false"/>
+ <setting id="debug" type="bool" label="30059" default="false"/>
+ <setting id="use_hls" type="bool" label="30060" default="true"/>
</category>
- <category label="MLB.TV">
- <setting id="email" type="text" label="30085" default=""/>
- <setting id="password" type="text" label="30086" default=""
option="hidden"/>
- <setting id="scenario" type="select" label="30087"
values="2400K|1800K|1200K|800K|500K|300K" default="2400K"/>
- <setting id="archive_scenario" type="select" label="30088"
values="FLASH_1200K_800X448|FLASH_800K_400X448|FLASH_500K_400X224|FLASH_128K_256X144"
default="FLASH_1200K_800X448"/>
+ <category label="30000">
+ <setting id="email" type="text" label="30055" default=""/>
+ <setting id="password" type="text" label="30056" default=""
option="hidden"/>
+ <setting id="scenario" type="select" label="30057"
values="2400K|1800K|1200K|800K|500K|300K" default="2400K"/>
+ <setting id="archive_scenario" type="select" label="30058"
values="FLASH_1200K_800X448|FLASH_800K_400X448|FLASH_500K_400X224|FLASH_128K_256X144"
default="FLASH_1200K_800X448"/>
</category>
</settings>
\ No newline at end of file
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=05a874d113b499564407d5b9b698a49ed187ce8d
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=81e8f3d0e6a26d9010e568d429546e32b9ab4431
commit 81e8f3d0e6a26d9010e568d429546e32b9ab4431
Author: beenje <[email protected]>
Date: Wed Apr 10 21:52:57 2013 +0200
[plugin.video.gamekings] updated to version 1.0.1
diff --git a/plugin.video.gamekings/addon.py b/plugin.video.gamekings/addon.py
index cdb3793..561fccf 100644
--- a/plugin.video.gamekings/addon.py
+++ b/plugin.video.gamekings/addon.py
@@ -17,8 +17,8 @@
#
#also in ..._const
__addon__ = "plugin.video.gamekings"
-__date__ = "2 april 2013"
-__version__ = "1.0.0"
+__date__ = "10 april 2013"
+__version__ = "1.0.1"
#
# Imports
@@ -26,7 +26,7 @@ __version__ = "1.0.0"
import os
import re
import sys
-import urllib
+import urllib, urllib2
import urlparse
import xbmc
import xbmcaddon
diff --git a/plugin.video.gamekings/addon.xml b/plugin.video.gamekings/addon.xml
index 853ff0f..508fe69 100644
--- a/plugin.video.gamekings/addon.xml
+++ b/plugin.video.gamekings/addon.xml
@@ -2,7 +2,7 @@
<addon
id="plugin.video.gamekings"
name="GameKings"
- version="1.0.0"
+ version="1.0.1"
provider-name="Skipmode A1">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
@@ -13,15 +13,15 @@
</extension>
<extension point="xbmc.addon.metadata">
<platform>all</platform>
- <summary lang="en">Watch videos from Gameskings.tv</summary>
- <description lang="en">Watch videos from Gamekings.tv</description>
+ <summary lang="en">Watch videos from Gameskings.tv (dutch)</summary>
+ <description lang="en">Watch videos from Gamekings.tv
(dutch)</description>
<disclaimer lang="en">For bugs, requests or general questions visit the
Gamekings thread on the XBMC forum.</disclaimer>
<language>nl</language>
<platform>all</platform>
<license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
- <forum></forum>
- <website></website>
+ <forum>http://forum.xbmc.org/showthread.php?tid=161375</forum>
+ <website>http://www.gamekings.tv</website>
<email></email>
- <source></source>
+ <source>git://github.com/skipmodea1/plugin.video.gamekings.git</source>
</extension>
</addon>
\ No newline at end of file
diff --git a/plugin.video.gamekings/changelog.txt
b/plugin.video.gamekings/changelog.txt
index 072b06f..2085da4 100644
--- a/plugin.video.gamekings/changelog.txt
+++ b/plugin.video.gamekings/changelog.txt
@@ -1,3 +1,15 @@
-v1.0.0 (Sunday, 17 March 2013) :
- - initial version;
+v1.0.0 (Sunday, 2 april 2013) :
+- initial version
+- filled in optional fields in addon.xml
+- added a display of an httperror
+- published it on github
+
+v1.0.1 (Wednesday, 10 april 2013) :
+- fixed thumbnails for pc category
+- removed repeating episodes in afleveringen category
+- added popup if media file cannnot be played or is not found
+- filled in optional fields in addon.xml
+- used title attribute more if possible
+
+
\ No newline at end of file
diff --git a/plugin.video.gamekings/resources/language/English/strings.xml
b/plugin.video.gamekings/resources/language/English/strings.xml
index ea09b07..ba8b2f7 100644
--- a/plugin.video.gamekings/resources/language/English/strings.xml
+++ b/plugin.video.gamekings/resources/language/English/strings.xml
@@ -33,6 +33,7 @@
<string id="30503">Next page</string>
<string id="30504">Getting video location...</string>
<string id="30505">No video found.</string>
- <string id="30506">No media found for:</string>
+ <string id="30506">Error playing media file.</string>
<string id="30507">Error getting page: %s</string>
+
</strings>
diff --git a/plugin.video.gamekings/resources/lib/gamekings_const.py
b/plugin.video.gamekings/resources/lib/gamekings_const.py
index f043230..3235199 100644
--- a/plugin.video.gamekings/resources/lib/gamekings_const.py
+++ b/plugin.video.gamekings/resources/lib/gamekings_const.py
@@ -8,5 +8,5 @@ __addon__ = "plugin.video.gamekings"
__settings__ = xbmcaddon.Addon(id=__addon__ )
__language__ = __settings__.getLocalizedString
__images_path__ = os.path.join( xbmcaddon.Addon(id=__addon__
).getAddonInfo('path'), 'resources', 'images' )
-__date__ = "2 april 2013"
-__version__ = "1.0.0"
\ No newline at end of file
+__date__ = "10 april 2013"
+__version__ = "1.0.1"
\ No newline at end of file
diff --git a/plugin.video.gamekings/resources/lib/gamekings_list.py
b/plugin.video.gamekings/resources/lib/gamekings_list.py
index 9db3798..005b413 100644
--- a/plugin.video.gamekings/resources/lib/gamekings_list.py
+++ b/plugin.video.gamekings/resources/lib/gamekings_list.py
@@ -7,7 +7,7 @@ from gamekings_utils import HTTPCommunicator
import os
import re
import sys
-import urllib
+import urllib, urllib2
import urlparse
import xbmc
import xbmcaddon
@@ -80,21 +80,22 @@ class Main:
# Get the thumbnail urls
#<img
src="http://www.gamekings.tv/wp-content/uploads/20130307_gowascensionreviewsplash1-75x75.jpg";
alt="God of War: Ascension Review">
#for http://www.gamekings.tv/pcgamersunite/ the thumbnail links
sometimes contain '//': f.e.
http://www.gamekings.tv//wp-content/uploads/20110706_hww_alienwarelaptop_slider-75x75.jpg
- thumbnail_urls = soup.findAll('img', attrs={'src':
re.compile("^http://www.gamekings.tv/wp-content/uploads/";)})
-
+ #thumbnail_urls = soup.findAll('img', attrs={'src':
re.compile("^http://www.gamekings.tv/wp-content/uploads/";)})
+ thumbnail_urls = soup.findAll('img', attrs={'src':
re.compile("^http://www.gamekings.tv/";)})
+
if (self.DEBUG) == 'true':
xbmc.log( "[ADDON] %s v%s (%s) debug mode, %s = %s" % (
__addon__, __version__, __date__, "len(thumbnail_urls)",
str(len(thumbnail_urls)) ), xbmc.LOGNOTICE )
- # Get the video page urls
- #http://www.gamekings.tv/videos/special-forces-team-x-review/
- #skip this:
http://www.gamekings.tv/videos/gears-of-war-judgment-hands-on/#disqus_thread
- video_page_urls = soup.findAll('a', attrs={'href':
re.compile("^http://www.gamekings.tv/videos/";)})
+ # Get the titles and video page urls
+ #<a
href="http://www.gamekings.tv/videos/lars-gustavsson-over-battlefield-4/";
title="Lars Gustavsson over Battlefield 4">
+ #skip this: <a
href='http://www.gamekings.tv/videos/lars-gustavsson-over-battlefield-4/#disqus_thread'>
+ video_page_urls_and_titles = soup.findAll('a', attrs={'href':
re.compile("^http://www.gamekings.tv/videos/";)})
if (self.DEBUG) == 'true':
- xbmc.log( "[ADDON] %s v%s (%s) debug mode, %s = %s" % (
__addon__, __version__, __date__, "len(video_page_urls)",
str(len(video_page_urls)) ), xbmc.LOGNOTICE )
+ xbmc.log( "[ADDON] %s v%s (%s) debug mode, %s = %s" % (
__addon__, __version__, __date__, "len(video_page_urls_and_titles)",
str(len(video_page_urls_and_titles)) ), xbmc.LOGNOTICE )
- for video_page_url in video_page_urls :
- video_page_url = video_page_url['href']
+ for video_page_url_and_title in video_page_urls_and_titles :
+ video_page_url = video_page_url_and_title['href']
#if link ends with a '/': process the link, if not:
skip the link
if video_page_url.endswith('/'):
pass
@@ -113,9 +114,17 @@ class Main:
continue
# Make title
- title = str(video_page_url)
- title = title[31:]
- title = title.capitalize()
+ #for category is 'afleveringen' use the video_page_url
to make the title
+ if self.plugin_category == __language__(30001):
+ title = str(video_page_url)
+ title = title[31:]
+ title = title.capitalize()
+ #for other category use the title attribute
+ else:
+ title = video_page_url_and_title['title']
+ #convert from unicode to encoded text (don't
use str() to do this)
+ title = title.encode('utf-8')
+
title = title.replace('-',' ')
title = title.replace('/',' ')
title = title.replace(' i ',' I ')
@@ -152,13 +161,22 @@ class Main:
if (self.DEBUG) == 'true':
xbmc.log( "[ADDON] %s v%s (%s) debug mode, %s =
%s" % ( __addon__, __version__, __date__, "title", str(title) ), xbmc.LOGNOTICE
)
- if str(self.video_list_page_url) ==
"http://www.gamekings.tv/pcgamersunite/":
- thumbnail_url = ''
- elif thumbnail_urls_index >= len(thumbnail_urls):
+ if thumbnail_urls_index >= len(thumbnail_urls):
thumbnail_url = ''
else:
thumbnail_url =
thumbnail_urls[thumbnail_urls_index]['src']
+ if (self.DEBUG) == 'true':
+ xbmc.log( "[ADDON] %s v%s (%s) debug mode, %s =
%s" % ( __addon__, __version__, __date__, "thumbnail_url", str(thumbnail_url)
), xbmc.LOGNOTICE )
+
+ #in afleveringen category, skip link if there's no
thumbnail. i do this because those links repeat on every page and are redundant
imho.
+ #it's bit of a hack but it'll do for now
+ if self.plugin_category == __language__(30001):
+ if thumbnail_url == '':
+ if (self.DEBUG) == 'true':
+ xbmc.log( "[ADDON] %s v%s (%s)
debug mode, %s = %s" % ( __addon__, __version__, __date__, "skipped
video_page_url aflevering in pc category because it doesn't have a thumbnail",
str(video_page_url_and_title) ), xbmc.LOGNOTICE )
+ continue
+
# Add to list
parameters = {"action" : "play", "video_page_url" :
video_page_url}
url = sys.argv[0] + '?' + urllib.urlencode(parameters)
diff --git a/plugin.video.gamekings/resources/lib/gamekings_main.py
b/plugin.video.gamekings/resources/lib/gamekings_main.py
index 923f2f9..b04d7a2 100644
--- a/plugin.video.gamekings/resources/lib/gamekings_main.py
+++ b/plugin.video.gamekings/resources/lib/gamekings_main.py
@@ -7,7 +7,7 @@ from gamekings_utils import HTTPCommunicator
import os
import re
import sys
-import urllib
+import urllib, urllib2
import urlparse
import xbmc
import xbmcaddon
diff --git a/plugin.video.gamekings/resources/lib/gamekings_play.py
b/plugin.video.gamekings/resources/lib/gamekings_play.py
index d627361..7304f9d 100644
--- a/plugin.video.gamekings/resources/lib/gamekings_play.py
+++ b/plugin.video.gamekings/resources/lib/gamekings_play.py
@@ -23,7 +23,7 @@ class Main:
#
def __init__( self ) :
# Get plugin settings
- self.DEBUG = __settings__.getSetting('debug')
+ self.DEBUG = __settings__.getSetting('debug')
if (self.DEBUG) == 'true':
xbmc.log( "[ADDON] %s v%s (%s) debug mode, %s = %s, %s
= %s" % ( __addon__, __version__, __date__, "ARGV", repr(sys.argv), "File",
str(__file__) ), xbmc.LOGNOTICE )
@@ -44,6 +44,13 @@ class Main:
#
def playVideo( self ) :
#
+ # Init
+ #
+ no_url_found = False
+ unplayable_media_file = False
+ have_valid_url = False
+
+ #
# Get current list item details
#
title = unicode( xbmc.getInfoLabel( "ListItem.Title" ),
"utf-8" )
@@ -60,7 +67,7 @@ class Main:
httpCommunicator = HTTPCommunicator()
- #Incidently a page request gets a HTTP Error 500: Internal
Server Error
+ #Sometimes a page request gets a HTTP Error 500: Internal
Server Error
#f.e. http://www.gamekings.tv/videos/het-fenomeen-minecraft/
try:
html_data = httpCommunicator.get ( self.video_page_url )
@@ -75,17 +82,23 @@ class Main:
soup = BeautifulSoup(html_data)
# Get the video url
- # <meta property="og:video"
content="http://stream.gamekings.tv/20130306_SpecialForces.mp4"/>
+ #<meta property="og:video"
content="http://stream.gamekings.tv/20130306_SpecialForces.mp4"/>
video_urls = soup.findAll('meta', attrs={'content':
re.compile("^http://stream.gamekings.tv/";)}, limit=1)
+
+ if (self.DEBUG) == 'true':
+ xbmc.log( "[ADDON] %s v%s (%s) debug mode, %s = %s" % (
__addon__, __version__, __date__, "len(video_urls)", str(len(video_urls)) ),
xbmc.LOGNOTICE )
+
if len(video_urls) == 0:
- have_valid_url = False
+ no_url_found = True
else:
video_url = video_urls[0]['content']
+ if (self.DEBUG) == 'true':
+ xbmc.log( "[ADDON] %s v%s (%s) debug mode, %s =
%s" % ( __addon__, __version__, __date__, "video_url", str(video_url) ),
xbmc.LOGNOTICE )
if httpCommunicator.exists( video_url ):
have_valid_url = True
else:
- have_valid_url = False
-
+ unplayable_media_file = True
+
# Play video
if have_valid_url:
playlist = xbmc.PlayList( xbmc.PLAYLIST_VIDEO )
@@ -106,8 +119,10 @@ class Main:
#
# Alert user
#
- else:
- xbmcgui.Dialog().ok( __language__(30000),
__language__(30505) )
+ elif no_url_found:
+ xbmcgui.Dialog().ok( __language__(30000),
__language__(30505))
+ elif unplayable_media_file:
+ xbmcgui.Dialog().ok( __language__(30000),
__language__(30506))
#
# The End
diff --git a/plugin.video.gamekings/todo.txt b/plugin.video.gamekings/todo.txt
index dee42ee..14942b4 100644
--- a/plugin.video.gamekings/todo.txt
+++ b/plugin.video.gamekings/todo.txt
@@ -1,2 +1,2 @@
- Showing videos in the category Nieuws (without having to check whether each
page contains a video or not)
-- Removing afleveringen (right side of the page) from category 'afleveringen'
\ No newline at end of file
+- Some older episodes won't play, figure out why not and what to do about it
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
plugin.video.gamekings/addon.py | 6 +-
plugin.video.gamekings/addon.xml | 12 +-
plugin.video.gamekings/changelog.txt | 16 ++-
.../resources/language/English/strings.xml | 3 +-
.../resources/lib/gamekings_const.py | 4 +-
.../resources/lib/gamekings_list.py | 50 ++++--
.../resources/lib/gamekings_main.py | 2 +-
.../resources/lib/gamekings_play.py | 31 +++-
plugin.video.gamekings/todo.txt | 2 +-
plugin.video.mlbmc/addon.xml | 2 +-
plugin.video.mlbmc/changelog.txt | 3 +
plugin.video.mlbmc/resources/__init__.py | 1 +
plugin.video.mlbmc/resources/settings.xml | 17 +-
.../LICENSE.txt | 0
plugin.video.nlhardwareinfo/addon.py | 64 ++++++++
plugin.video.nlhardwareinfo/addon.xml | 27 +++
plugin.video.nlhardwareinfo/changelog.txt | 4 +
plugin.video.nlhardwareinfo/fanart.jpg | Bin 0 -> 161004 bytes
plugin.video.nlhardwareinfo/icon.png | Bin 0 -> 99638 bytes
.../resources/images/next-page.png | Bin 14529 -> 14529 bytes
.../resources/language/English/strings.xml | 37 +++++
.../resources/lib/nlhardwareinfo_const.py | 12 ++
.../resources/lib/nlhardwareinfo_list.py | 172 ++++++++++++++++++++
.../resources/lib/nlhardwareinfo_main.py | 44 +++++
.../resources/lib/nlhardwareinfo_play.py | 133 +++++++++++++++
.../resources/lib/nlhardwareinfo_utils.py | 83 ++++++++++
.../resources/settings.xml | 0
27 files changed, 676 insertions(+), 49 deletions(-)
create mode 100644 plugin.video.mlbmc/resources/__init__.py
copy {plugin.audio.dradio => plugin.video.nlhardwareinfo}/LICENSE.txt (100%)
create mode 100644 plugin.video.nlhardwareinfo/addon.py
create mode 100644 plugin.video.nlhardwareinfo/addon.xml
create mode 100644 plugin.video.nlhardwareinfo/changelog.txt
create mode 100644 plugin.video.nlhardwareinfo/fanart.jpg
create mode 100644 plugin.video.nlhardwareinfo/icon.png
copy {plugin.video.gamekings =>
plugin.video.nlhardwareinfo}/resources/images/next-page.png (100%)
create mode 100644
plugin.video.nlhardwareinfo/resources/language/English/strings.xml
create mode 100644
plugin.video.nlhardwareinfo/resources/lib/nlhardwareinfo_const.py
create mode 100644
plugin.video.nlhardwareinfo/resources/lib/nlhardwareinfo_list.py
create mode 100644
plugin.video.nlhardwareinfo/resources/lib/nlhardwareinfo_main.py
create mode 100644
plugin.video.nlhardwareinfo/resources/lib/nlhardwareinfo_play.py
create mode 100644
plugin.video.nlhardwareinfo/resources/lib/nlhardwareinfo_utils.py
copy {plugin.video.gamekings =>
plugin.video.nlhardwareinfo}/resources/settings.xml (100%)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
![http://www.gamekings.tv/wp-content/uploads/20130307_gowascensionreviewsplash1-75x75.jpg"](http://www.gamekings.tv/wp-content/uploads/20130307_gowascensionreviewsplash1-75x75.jpg"){kind=link}
