The branch, frodo has been updated
via 4f79a3d498c4ccd8ccf61789d10af51923e609f1 (commit)
via 5b9e54e3825cb5af4851676f8ec9eed7c872f3a7 (commit)
from 5e172ffea7a21e9385c6dc98810c900760242056 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=4f79a3d498c4ccd8ccf61789d10af51923e609f1
commit 4f79a3d498c4ccd8ccf61789d10af51923e609f1
Author: beenje <bee...@xbmc.org>
Date: Mon Mar 25 21:38:47 2013 +0100
[plugin.video.nolife] updated to version 2.16.4
diff --git a/plugin.video.nolife/addon.xml b/plugin.video.nolife/addon.xml
index 40d7108..ae9bd38 100644
--- a/plugin.video.nolife/addon.xml
+++ b/plugin.video.nolife/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.nolife"
name="Nolife Online"
- version="2.16.3"
+ version="2.16.4"
provider-name="gormux">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
diff --git a/plugin.video.nolife/default.py b/plugin.video.nolife/default.py
index 104ecff..9b18c37 100644
--- a/plugin.video.nolife/default.py
+++ b/plugin.video.nolife/default.py
@@ -510,7 +510,7 @@ def extractVideoInfo(element):
info.seen = False
reg_date = '<p style="padding-right:25px;'\
- ' padding-left:10px;">.*</p>'
+ ' padding-left:55px;">.*</p>'
info.thumb =
re.compile('data-thumb=".*"').findall(str(element))[0][12:][:-1]
_date_len =
remove_html_tags(re.compile(reg_date).findall(str(element))[0])
info.duration = sum(int(x) * 60 ** i for i,x in
enumerate(reversed(_date_len.split(' - ')[1].strip('s').split(":"))))
@@ -524,7 +524,7 @@ def extractVideoInfo(element):
reg_vid = 'a href="emission-.*" '
info.vid = re.compile(reg_vid).findall(str(element))[0][17:][:-2]
- reg_desc = '<p style="padding-left:10px;"><strong>.*'
+ reg_desc = '<p style="padding-left:55px;"><strong>.*'
info.desc =
remove_html_tags(re.compile(reg_desc).findall(str(element))[0][30:])
info.name =
remove_html_tags(re.compile('<h3.*').findall(str(element))[0])
@@ -546,7 +546,7 @@ def extractVideoSearchInfo(element):
reg_srch = 'a href="emission-.*" '
info.id = re.compile(reg_srch).findall(str(element))[0][17:][:-2]
- reg_desc = '<p style="padding-left:10px;"><strong>.*'
+ reg_desc = '<p style="padding-left:55px;"><strong>.*'
info.thumb =
re.compile('data-thumb=".*"').findall(str(element))[0][12:][:-1]
_bdesc = re.compile(reg_desc).findall(str(element))[0][30:]
_bname = re.compile('<h3.*').findall(str(element))[0]
@@ -556,7 +556,7 @@ def extractVideoSearchInfo(element):
req_availibity = '<p style="float:right; margin-right:-15px;
clear:right;"><strong>.*'
info.availability =
remove_html_tags(re.compile(req_availibity).findall(str(element))[0][30:])
- reg_date = '<p style="padding-right:25px; padding-left:10px;">.*</p>'
+ reg_date = '<p style="padding-right:25px; padding-left:55px;">.*</p>'
_date_len =
remove_html_tags(re.compile(reg_date).findall(str(element))[0])
info.duration = _date_len.split(' - ')[1]
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=5b9e54e3825cb5af4851676f8ec9eed7c872f3a7
commit 5b9e54e3825cb5af4851676f8ec9eed7c872f3a7
Author: beenje <bee...@xbmc.org>
Date: Mon Mar 25 21:38:43 2013 +0100
[plugin.video.synopsi] updated to version 1.0.6
diff --git a/plugin.video.synopsi/addon.xml b/plugin.video.synopsi/addon.xml
index fc9779e..2653165 100644
--- a/plugin.video.synopsi/addon.xml
+++ b/plugin.video.synopsi/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.synopsi"
name="SynopsiTV"
- version="1.0.5"
+ version="1.0.6"
provider-name="Synopsi.TV">
<requires>
<import addon="xbmc.python" version="2.1.0" />
diff --git a/plugin.video.synopsi/cache.py b/plugin.video.synopsi/cache.py
index 8a51626..913b724 100644
--- a/plugin.video.synopsi/cache.py
+++ b/plugin.video.synopsi/cache.py
@@ -128,6 +128,11 @@ class OfflineStvList(object):
if title.has_key('id'):
movie['stvId'] = title['id']
+
+ # use synopsi runtime if possible
+ if title.get('runtime'):
+ movie['runtime'] = 60 * title['runtime']
+
self.log('identified: ' + title['name'])
else:
self.log('NOT identified %s' % movie['file'])
diff --git a/plugin.video.synopsi/changelog.txt
b/plugin.video.synopsi/changelog.txt
index 38a7ce0..7e1d8f8 100644
--- a/plugin.video.synopsi/changelog.txt
+++ b/plugin.video.synopsi/changelog.txt
@@ -1,3 +1,8 @@
+[B]Version 1.0.6[/B]
+
+* Fixed: if xbmc.Player doesn't provide runtime, plugin failed to show rating
dialog
+* Fixed: api directors format change
+
[B]Version 1.0.5[/B]
+ Added: display year after movie name
diff --git a/plugin.video.synopsi/dialog.py b/plugin.video.synopsi/dialog.py
index 9df5d42..9c3d80c 100644
--- a/plugin.video.synopsi/dialog.py
+++ b/plugin.video.synopsi/dialog.py
@@ -549,7 +549,7 @@ def video_dialog_template_fill(stv_details, json_data={}):
append_tuple('Genre', 'genres', tr_genre)
append_tuple('Cast', 'cast', tr_cast)
- append_tuple('Director', 'directors', tr_genre) # reuse
tr_genre here
+ append_tuple('Director', 'directors', tr_cast) # reuse tr_cast
here
append_tuple('Runtime', 'runtime', tr_runtime)
if tpl_data.get('date'):
diff --git a/plugin.video.synopsi/resources/const.py
b/plugin.video.synopsi/resources/const.py
index ceca21c..45e41d1 100644
--- a/plugin.video.synopsi/resources/const.py
+++ b/plugin.video.synopsi/resources/const.py
@@ -6,4 +6,6 @@ KEY="59c53964b1013defcff0155f6e4d54a4"
SECRET="487615d20b22cdce510fd3476ed84d924e2b0c45ce7c49dc621764e05fae0904"
# addon
-SERVICE_IFACE_VERSION=1
+# incrementing this will cause restarting plugin after update
+SERVICE_IFACE_VERSION=2
+
diff --git a/plugin.video.synopsi/scrobbler.py
b/plugin.video.synopsi/scrobbler.py
index 62162f2..1cbdc39 100644
--- a/plugin.video.synopsi/scrobbler.py
+++ b/plugin.video.synopsi/scrobbler.py
@@ -90,10 +90,10 @@ class SynopsiPlayer(xbmc.Player):
else:
if xbmc.Player().isPlayingVideo():
self.playing = True
- self.total_time = xbmc.Player().getTotalTime()
+ self.media_file = self.getPlayingFile()
+ self.total_time = self.getTotalTime()
self.current_time = self.get_time()
self.started()
- self.media_file = self.getPlayingFile()
self.mediainfotag = self.getVideoInfoTag()
self.last_played_file = self.media_file
self.subtitle_file = self.getSubtitles()
@@ -133,6 +133,15 @@ class SynopsiPlayer(xbmc.Player):
return t
+ def getTotalTime(self):
+ tt = xbmc.Player().getTotalTime()
+
+ if not tt:
+ title = self.cache.getByFilename(self.media_file)
+ tt = title.get('runtime')
+
+ return tt
+
def get_media_info_tag(self):
try:
self.mediainfotag = self.getVideoInfoTag()
@@ -174,9 +183,14 @@ class SynopsiPlayerDecor(SynopsiPlayer):
def stopped(self):
self.playerEvent('stop')
+
+ # if we still dont have total runtime, use some default average
(this should now be very rare case)
+ if not self.total_time:
+ self.total_time = 5400
+
percent = self.current_time / self.total_time
self.log('percent:' + str(self.current_time / self.total_time))
-
+
# ask for rating only if more than 70% of movie passed
if percent > 0.7:
self.rate_file(self.last_played_file)
diff --git a/plugin.video.synopsi/utilities.py
b/plugin.video.synopsi/utilities.py
index ad8c8c5..2a29837 100644
--- a/plugin.video.synopsi/utilities.py
+++ b/plugin.video.synopsi/utilities.py
@@ -103,7 +103,7 @@ t_nounwatched = 'There are no unwatched episodes in your TV
Show tracking'
t_nolocalrecco = 'There are no items in this list. Either you have no movies
in your library or they have not been recognized by Synopsi'
t_nolocaltvshow = 'There are no items in this list. Either you have no
episodes in your library or they have not been recognized by Synopsi'
t_needrestart = 'To start the SynopsiTV service, please turn off your media
center then turn it back on again. Do this now?'
-t_needrestart_update = 'Addon service has been updated. For the plugin to work
correctly, turn off your media center then turn it back on again. Do this now?'
+t_needrestart_update = 'Addon has been recently updated. For the plugin to
work, it\'s neccessary to restart your media center. Restart now ?'
t_enter_title_to_search = 'Enter a title name to search for.'
t_correct_search_title = 'Search for the correct title'
@@ -234,7 +234,7 @@ def check_first_run():
xbmc.executebuiltin('ReloadSkin()')
raise Exception('Addon service is not running')
-def dialog_text(msg, max_line_length=20, max_lines=3):
+def dialog_text(msg, max_line_length=60, max_lines=3):
line_end = [0]
idx = -1
line_no = 0
@@ -274,11 +274,11 @@ def list_get(alist, index, default=''):
return default
def dialog_ok(msg):
- lines = dialog_text(msg, 45)
+ lines = dialog_text(msg)
return xbmcgui.Dialog().ok(t_stv, list_get(lines, 0), list_get(lines,
1), list_get(lines, 2))
def dialog_yesno(msg):
- lines = dialog_text(msg, 45)
+ lines = dialog_text(msg)
return xbmcgui.Dialog().yesno(t_stv, list_get(lines, 0),
list_get(lines, 1), list_get(lines, 2))
diff --git a/plugin.video.synopsi/xbmcrpc.py b/plugin.video.synopsi/xbmcrpc.py
index 19c4075..2b7fd81 100644
--- a/plugin.video.synopsi/xbmcrpc.py
+++ b/plugin.video.synopsi/xbmcrpc.py
@@ -8,7 +8,7 @@ import json
from utilities import *
from loggable import Loggable
-defaultProperties = ['file', 'imdbnumber', "lastplayed", "playcount"]
+defaultProperties = ['file', 'imdbnumber', "lastplayed", "playcount",
"runtime"]
class xbmcRPCclient(Loggable):
-----------------------------------------------------------------------
Summary of changes:
plugin.video.nolife/addon.xml | 2 +-
plugin.video.nolife/default.py | 8 ++++----
plugin.video.synopsi/addon.xml | 2 +-
plugin.video.synopsi/cache.py | 5 +++++
plugin.video.synopsi/changelog.txt | 5 +++++
plugin.video.synopsi/dialog.py | 2 +-
plugin.video.synopsi/resources/const.py | 4 +++-
plugin.video.synopsi/scrobbler.py | 20 +++++++++++++++++---
plugin.video.synopsi/utilities.py | 8 ++++----
plugin.video.synopsi/xbmcrpc.py | 2 +-
10 files changed, 42 insertions(+), 16 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
