ukamnya
/
plugin.video.torrenter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

external seek

pull/15/head
DiMartinoXBMC 2017-01-18 15:59:45 +03:00
parent ad88903843
commit f499dd8502
6 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Anteoloader.py
View File

@ -302,12 +302,12 @@ class AnteoPlayer(xbmc.Player):
if self.buffer(): if self.buffer():
log('[AnteoPlayer]: ************************************* GOING LOOP') log('[AnteoPlayer]: ************************************* GOING LOOP')
if self.setup_play(): if self.setup_play():
WatchedHistoryDB().add(self.basename, WatchedHistoryDB().add(self.basename, self.torrentUrl,
foldername(self.getContentList()[self.contentId]['title']), foldername(self.getContentList()[self.contentId]['title']),
self.watchedTime, self.totalTime, self.contentId, self.fullSize) self.watchedTime, self.totalTime, self.contentId, self.fullSize)
self.setup_subs() self.setup_subs()
self.loop() self.loop()
WatchedHistoryDB().add(self.basename, foldername(self.getContentList()[self.contentId]['title']), self.watchedTime, self.totalTime, self.contentId, self.fullSize) WatchedHistoryDB().add(self.basename, self.torrentUrl, foldername(self.getContentList()[self.contentId]['title']), self.watchedTime, self.totalTime, self.contentId, self.fullSize)
else: else:
log('[AnteoPlayer]: ************************************* break') log('[AnteoPlayer]: ************************************* break')
break break

3
Core.py
View File

@ -1479,6 +1479,9 @@ class Core:
else: else:
torrentUrl = self.__settings__.getSetting("lastTorrent") torrentUrl = self.__settings__.getSetting("lastTorrent")
#xbmc.executebuiltin('Action(Stop)') #xbmc.executebuiltin('Action(Stop)')
if self.torrent_player != '1' and params.get('external') == '1' and not params.get('seek'):
params['seek'] = watched_seek(torrentUrl, params['url'])
self.userStorage(params) self.userStorage(params)
if self.torrent_player == '0': if self.torrent_player == '0':
from Player import TorrentPlayer from Player import TorrentPlayer

4
Inposloader.py
View File

@ -273,12 +273,12 @@ class InposPlayer(xbmc.Player):
while True: while True:
log('['+author+'Player]: ************************************* GOING LOOP') log('['+author+'Player]: ************************************* GOING LOOP')
if self.setup_play(): if self.setup_play():
WatchedHistoryDB().add(self.basename, WatchedHistoryDB().add(self.basename, self.torrentUrl,
foldername(self.getContentList()[self.contentId]['title']), foldername(self.getContentList()[self.contentId]['title']),
self.watchedTime, self.totalTime, self.contentId, self.fullSize) self.watchedTime, self.totalTime, self.contentId, self.fullSize)
self.setup_subs() self.setup_subs()
self.loop() self.loop()
WatchedHistoryDB().add(self.basename, foldername(self.getContentList()[self.contentId]['title']), self.watchedTime, self.totalTime, self.contentId, self.fullSize) WatchedHistoryDB().add(self.basename, self.torrentUrl, foldername(self.getContentList()[self.contentId]['title']), self.watchedTime, self.totalTime, self.contentId, self.fullSize)
else: else:
log('['+author+'Player]: ************************************* break') log('['+author+'Player]: ************************************* break')
break break

4
Player.py
View File

@ -166,12 +166,12 @@ class TorrentPlayer(xbmc.Player):
debug('************************************* GOING LOOP') debug('************************************* GOING LOOP')
self.torrent.startSession() self.torrent.startSession()
self.torrent.continueSession(self.contentId) self.torrent.continueSession(self.contentId)
WatchedHistoryDB().add(self.basename, WatchedHistoryDB().add(self.basename, self.torrentUrl,
foldername(self.torrent.getContentList()[self.contentId]['title']), foldername(self.torrent.getContentList()[self.contentId]['title']),
self.watchedTime, self.totalTime, self.contentId, self.watchedTime, self.totalTime, self.contentId,
self.fullSize / 1024 / 1024) self.fullSize / 1024 / 1024)
self.loop() self.loop()
WatchedHistoryDB().add(self.basename, foldername(self.torrent.getContentList()[self.contentId]['title']), self.watchedTime, self.totalTime, self.contentId, self.fullSize / 1024 / 1024) WatchedHistoryDB().add(self.basename, self.torrentUrl, foldername(self.torrent.getContentList()[self.contentId]['title']), self.watchedTime, self.totalTime, self.contentId, self.fullSize / 1024 / 1024)
else: else:
break break
debug('************************************* GO NEXT?') debug('************************************* GO NEXT?')

3
changelog.txt
View File

@ -1,5 +1,8 @@
English changelog at http://bit.ly/1MfSVUP English changelog at http://bit.ly/1MfSVUP
[B]Version 2.6.2[/B]
[+] История Просмотров: Перемотка при внешнем вызове
[B]Version 2.6.1[/B] [B]Version 2.6.1[/B]
[+] Окно Поиска: Использование окна в сторонних плагинах [+] Окно Поиска: Использование окна в сторонних плагинах

28
functions.py
View File

@ -1071,7 +1071,14 @@ class WatchedHistoryDB:
self._close() self._close()
return x if x else None return x if x else None
def add(self, filename, foldername = None, seek = 0, length = 1, ind = 0, size = 0): def getbypathind(self, path, ind):
self._connect()
self.cur.execute('select seek from history where path="' + path + '" AND ind=' + ind)
x = self.cur.fetchone()
self._close()
return x if x else None
def add(self, filename, path, foldername = None, seek = 0, length = 1, ind = 0, size = 0):
try: try:
watchedPercent = int((float(seek) / float(length)) * 100) watchedPercent = int((float(seek) / float(length)) * 100)
except: except:
@ -1080,7 +1087,7 @@ class WatchedHistoryDB:
if self.history_bool and watchedPercent <= max_history_add: if self.history_bool and watchedPercent <= max_history_add:
self._connect() self._connect()
url = __settings__.getSetting("lastTorrentUrl") url = __settings__.getSetting("lastTorrentUrl")
path = __settings__.getSetting("lastTorrent") #path = __settings__.getSetting("lastTorrent")
if not foldername: if not foldername:
foldername = '' foldername = ''
self.cur.execute('delete from history where filename="' + decode(filename) + '"') self.cur.execute('delete from history where filename="' + decode(filename) + '"')
@ -2303,3 +2310,20 @@ def loadsw_onstop():
import searchwindow import searchwindow
params = {'mode': 'load'} params = {'mode': 'load'}
searchwindow.main(params) searchwindow.main(params)
def watched_seek(filename, ind):
db = WatchedHistoryDB()
seek = db.getbypathind(filename, ind)
log('[watched_seek] seek - '+str(seek))
if seek:
seek = seek[0]
seek = int(seek) if int(seek) > 3 * 60 else 0
if seek > 0:
seek_text = '%02d:%02d:%02d' % ((seek / (60 * 60)), (seek / 60) % 60, seek % 60)
dialog_items = [Localization.localize('Play (from %s)') % seek_text,
Localization.localize('Play (from start)')]
ret = xbmcgui.Dialog().select(Localization.localize('Play (with seek)'), dialog_items)
if ret == 0:
return str(seek)
else:
return '0'