The branch, frodo has been updated
via 28e6ef54bfe384b124138d94ec4a0706dc8d4ccc (commit)
via ffd3aa17287f87029f073fc09f87c5fe7054267c (commit)
from 36e3c4bd164c671ddbab091c598affa67a9894b6 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=28e6ef54bfe384b124138d94ec4a0706dc8d4ccc
commit 28e6ef54bfe384b124138d94ec4a0706dc8d4ccc
Author: Martijn Kaijser <[email protected]>
Date: Sat Nov 23 12:03:35 2013 +0100
[script.module.metahandler] 2.3.1
diff --git a/script.module.metahandler/addon.xml
b/script.module.metahandler/addon.xml
index 2d44f56..d779314 100644
--- a/script.module.metahandler/addon.xml
+++ b/script.module.metahandler/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.module.metahandler"
name="metahandler"
- version="2.3.0"
+ version="2.3.1"
provider-name="Eldorado">
<requires>
<import addon="xbmc.python" version="2.1.0" />
diff --git a/script.module.metahandler/changelog.txt
b/script.module.metahandler/changelog.txt
index 28a7909..59f7ba0 100644
--- a/script.module.metahandler/changelog.txt
+++ b/script.module.metahandler/changelog.txt
@@ -1,3 +1,7 @@
+[B]Version 2.3.1[/B]
+- Fixed bug on getting tvshows from cache - returns None instead of letting
exception pass
+- Re-added db initialization - stupid mistake
+
[B]Version 2.3.0[/B]
- Fixed changed watched on episodes (again)
- Added fetch of trailers using v3 of tmdb api
@@ -37,4 +41,4 @@
- Corrected Ratings and Episode values on TV Shows not returning in proper
format in all scenarios
[B]Version 1.0.0[/B]
-- Initial Release.
\ No newline at end of file
+- Initial Release.
diff --git a/script.module.metahandler/lib/metahandler/metahandlers.py
b/script.module.metahandler/lib/metahandler/metahandlers.py
index ad5de60..482929f 100644
--- a/script.module.metahandler/lib/metahandler/metahandlers.py
+++ b/script.module.metahandler/lib/metahandler/metahandlers.py
@@ -154,6 +154,9 @@ class MetaData:
self.dbcon.row_factory = database.Row # return results indexed by
field names and not numbers so we can convert to dict
self.dbcur = self.dbcon.cursor()
+ # initialize cache db
+ self._cache_create_movie_db()
+
def __del__(self):
''' Cleanup db when object destroyed '''
@@ -990,7 +993,7 @@ class MetaData:
matchedrow = self.dbcur.fetchone()
except Exception, e:
common.addon.log('************* Error selecting from cache db: %s'
% e, 4)
- pass
+ return None
if matchedrow:
common.addon.log('Found meta information by name in cache table:
%s' % dict(matchedrow), 0)
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=ffd3aa17287f87029f073fc09f87c5fe7054267c
commit ffd3aa17287f87029f073fc09f87c5fe7054267c
Author: Martijn Kaijser <[email protected]>
Date: Sat Nov 23 12:02:17 2013 +0100
[script.funnyordie] 0.0.3
diff --git a/script.funnyordie/addon.xml b/script.funnyordie/addon.xml
index 6514bde..b600a7c 100644
--- a/script.funnyordie/addon.xml
+++ b/script.funnyordie/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.funnyordie"
name="Funny Or Die"
- version="0.0.2"
+ version="0.0.3"
provider-name="divingmule">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
@@ -21,5 +21,6 @@
<license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
<source>https://github.com/divingmule/script.funnyordie</source>
<forum>http://forum.xbmc.org/showthread.php?tid=174829</forum>
+ <website>http://www.funnyordie.com</website>
</extension>
</addon>
diff --git a/script.funnyordie/changelog.txt b/script.funnyordie/changelog.txt
index d5511ec..2de2260 100644
--- a/script.funnyordie/changelog.txt
+++ b/script.funnyordie/changelog.txt
@@ -1,3 +1,6 @@
+Version 0.0.3
+fix website changes
+
Version 0.0.2
bug fixes
switch to a normal window
diff --git a/script.funnyordie/default.py b/script.funnyordie/default.py
index d4a5687..558a1f6 100644
--- a/script.funnyordie/default.py
+++ b/script.funnyordie/default.py
@@ -94,14 +94,13 @@ def get_videos(soup):
def get_videos_nav(soup):
- items = [
- soup.find('div', attrs={'class': 'browse_navigation'})('div',
attrs={'id': 'date_filter'})[0],
- soup.find('div', attrs={'class': 'browse_navigation'})('div',
attrs={'id': 'sort_filter'})[0],
- soup.find('div', attrs={'class': 'browse_navigation'})('div',
attrs={'id': 'category_filter'})[0]]
- nav = {'current': []}
- for i in items:
- nav['current'].append([{'label': x.string, 'value': y.string} for x in
i('span')[0] for y in i('span')[1].a][0])
- nav[i['id']] = [{'title': x.string, 'href': x['href']} for x in i('a')]
+ label_tags = soup('span', attrs={'class': "dropdown_label"})
+ nav = [{'name': i.string,
+ 'items': [{'title': x.string,
+ 'href': x['href']} for x in
+ i.findPrevious('ul', attrs={'class':
'options'})('a')],
+ 'current': i.findPrevious('a', attrs={'class':
'current'}).contents[0].strip()} for
+ i in label_tags]
return nav
@@ -117,11 +116,12 @@ def get_homepage(url):
href = i.a['href']
if '/videos/' in href:
title = i.h2.string
- if i.h3.string:
+ if title and i.h3.string:
title += ': ' + i.h3.string
if title and '&#' in title:
title = unescape(title)
- jumbo.append({'title': title, 'href': href, 'thumb':
i.img['src']})
+ thumb = i.img['src'].replace(' ', '%20')
+ jumbo.append({'title': title, 'href': href, 'thumb': thumb})
cat_items = soup.find('section', attrs={'id':
'browse-menu-featured'})('article')
celeb_items = soup.find('section', attrs={'id':
'browse-menu-celebrities'})('article')
link_items = soup.find('ul', attrs={'class': 'quick-links'})('a')
@@ -172,6 +172,8 @@ def get_listitem(item, is_video=False):
thumb = ''
if item.has_key('thumb'):
thumb = item['thumb']
+ if item['title'] is None:
+ item['title'] = ''
listitem = xbmcgui.ListItem('[B]%s[/B]' %item['title'],
thumbnailImage=thumb)
if is_video:
listitem.setInfo(type="Video", infoLabels={"Title": item['title']})
@@ -335,14 +337,14 @@ class FunnyOrDieGUI(xbmcgui.WindowXML):
self.setFocus(v_control)
def set_video_nav(self, nav):
- for i in nav['current']:
- if i['label'] == 'VIEWING':
+ for i in nav:
+ if i['name'] == 'VIEWING':
control = self.window.getControl(1266)
- elif i['label'] == 'SORT BY':
+ elif i['name'] == 'SORT BY':
control = self.window.getControl(1267)
- elif i['label'] == 'DATE':
+ elif i['name'] == 'DATE':
control = self.window.getControl(1268)
- control.setLabel('%s : [B]%s[/B]' %(i['label'], i['value']))
+ control.setLabel('%s : [B]%s[/B]' %(i['name'], i['current']))
self.videos_nav = nav
def set_video_filter_button(self, reset=False):
@@ -355,7 +357,7 @@ class FunnyOrDieGUI(xbmcgui.WindowXML):
i.controlUp(self.nav_button_1)
def filter_videos(self, filter_type):
- items = self.videos_nav[filter_type]
+ items = [i['items'] for i in self.videos_nav if i['name'] ==
filter_type][0]
for i in items:
self.filter_list.addItem(get_listitem(i))
xbmc.executebuiltin("Skin.ToggleSetting(FilterDialog)")
@@ -453,13 +455,13 @@ class FunnyOrDieGUI(xbmcgui.WindowXML):
# video filter controls
elif control_id == 1266:
self.menu = 'FilterDialog'
- if self.window.getProperty('videos_filter') == 'category_filter':
+ if self.window.getProperty('videos_filter') == 'VIEWING':
xbmc.executebuiltin("Skin.ToggleSetting(FilterDialog)")
else:
self.filter_list.reset()
- self.window.setProperty('videos_filter', 'category_filter')
+ self.window.setProperty('videos_filter', 'VIEWING')
self.filter_dialog.setPosition(95, 85)
- self.filter_videos('category_filter')
+ self.filter_videos('VIEWING')
xbmc.sleep(500)
self.set_video_filter_button()
self.setFocus(self.filter_list)
@@ -467,13 +469,13 @@ class FunnyOrDieGUI(xbmcgui.WindowXML):
elif control_id == 1267:
self.menu = 'FilterDialog'
- if self.window.getProperty('videos_filter') == 'sort_filter':
+ if self.window.getProperty('videos_filter') == 'SORT BY':
xbmc.executebuiltin("Skin.ToggleSetting(FilterDialog)")
else:
self.filter_list.reset()
- self.window.setProperty('videos_filter', 'sort_filter')
+ self.window.setProperty('videos_filter', 'SORT BY')
self.filter_dialog.setPosition(435, 85)
- self.filter_videos('sort_filter')
+ self.filter_videos('SORT BY')
xbmc.sleep(500)
self.set_video_filter_button()
self.setFocus(self.filter_list)
@@ -481,13 +483,13 @@ class FunnyOrDieGUI(xbmcgui.WindowXML):
elif control_id == 1268:
self.menu = 'FilterDialog'
- if self.window.getProperty('videos_filter') == 'date_filter':
+ if self.window.getProperty('videos_filter') == 'DATE':
xbmc.executebuiltin("Skin.ToggleSetting(FilterDialog)")
else:
self.filter_list.reset()
- self.window.setProperty('videos_filter', 'date_filter')
+ self.window.setProperty('videos_filter', 'DATE')
self.filter_dialog.setPosition(780, 85)
- self.filter_videos('date_filter')
+ self.filter_videos('DATE')
xbmc.sleep(500)
self.set_video_filter_button()
self.setFocus(self.filter_list)
-----------------------------------------------------------------------
Summary of changes:
script.funnyordie/addon.xml | 3 +-
script.funnyordie/changelog.txt | 3 +
script.funnyordie/default.py | 52 ++++++++++---------
script.module.metahandler/addon.xml | 2 +-
script.module.metahandler/changelog.txt | 6 ++-
.../lib/metahandler/metahandlers.py | 5 ++-
6 files changed, 42 insertions(+), 29 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Shape the Mobile Experience: Free Subscription
Software experts and developers: Be at the forefront of tech innovation.
Intel(R) Software Adrenaline delivers strategic insight and game-changing
conversations that shape the rapidly evolving mobile landscape. Sign up now.
http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
