Skip to content

Fixing getEpisodeTVDB #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maximebeckman wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixing getEpisodeTVDB #59

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e26f588
Fixing getEpisodeTVDB
maximebeckman Dec 17, 2017
34ba7bb
Bug fix on the episode not found
maximebeckman Jul 7, 2019
9875f8c
Bug fix division by zero
maximebeckman Jul 7, 2019
8d7a2c5
Bug fix on the episode not found - Player.OnPlay
maximebeckman Jul 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 30 additions & 9 deletions default.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,16 @@ def onNotification(self, sender, method, data):
log('season=%s' % item['season'])
log('episode=%s' % item['episode'])
log('episode_id=%s' % item['episode_id'])
if len(item['showtitle']) > 0 and item['season'] > 0 and item['episode'] > 0 and item['episode_id'] > 0:
if len(item['showtitle']) > 0 and item['season'] > 0 and item['episode'] > 0:
player.filename = '%s.S%.2dE%.2d' % (formatName(item['showtitle']), float(item['season']), float(item['episode']))
log('tvshowtitle=%s' % player.filename)
player.episode = FindEpisode(player.token, item['episode_id'])
log('episode.is_found=%s' % player.episode.is_found)
log('Is episode find with Episode_id :%s' % player.episode.is_found)
if not player.episode.is_found:
player.episode = FindEpisode(player.token,0, player.filename);
item['episode_id'] = self.episode.id
log('Is episode find with Filename :%s' % player.episode.is_found)

if player.episode.is_found:
if player.notifications == 'true':
if player.notif_during_playback == 'false' and player.isPlaying() == 1:
Expand All @@ -136,7 +141,10 @@ def onNotification(self, sender, method, data):
notif(__language__(32905), time=2500)
if (method == 'Player.OnStop'):
self._tearDown()
actual_percent = (self._last_pos/self._total_time)*100
if self._total_time > 0:
actual_percent = (self._last_pos/self._total_time)*100
else:
actual_percent = 0;
log('last_pos / total_time : %s / %s = %s %%' % (self._last_pos, self._total_time, actual_percent))
log('Player.OnStop')
if player.http == 'true' and player.http_playing == True :
Expand Down Expand Up @@ -205,11 +213,16 @@ def onNotification(self, sender, method, data):
log('episode=%s' % item['episode'])
log('episode_id=%s' % item['episode_id'])
log('playcount=%s' % playcount)
if len(item['showtitle']) > 0 and item['season'] > 0 and item['episode'] > 0 and item['episode_id'] > 0:
if len(item['showtitle']) > 0 and item['season'] > 0 and item['episode'] > 0:
self.filename = '%s.S%.2dE%.2d' % (formatName(item['showtitle']), float(item['season']), float(item['episode']))
log('tvshowtitle=%s' % self.filename)
self.episode = FindEpisode(player.token, item['episode_id'])
log('episode.is_found=%s' % self.episode.is_found)
log('Is episode find with Episode_id :%s' % self.episode.is_found)
if not self.episode.is_found:
self.episode = FindEpisode(player.token,0, self.filename);
item['episode_id'] = self.episode.id
log('Is episode find with Filename :%s' % self.episode.is_found)

if self.episode.is_found:
if playcount is 1:
log('MarkAsWatched(*, %s, %s, %s)' % (self.filename, player.facebook, player.twitter))
Expand Down Expand Up @@ -259,22 +272,30 @@ def onNotification(self, sender, method, data):
if player.notif_during_playback == 'false' and player.isPlaying() == 1:
return
notif(__language__(32907), time=2500)


def getEpisodeTVDB(self, xbmc_id):
rpccmd = {'jsonrpc': '2.0', 'method': 'VideoLibrary.GetEpisodeDetails', 'params': {"episodeid": int(xbmc_id), 'properties': ['season', 'episode', 'tvshowid', 'showtitle', 'uniqueid']}, 'id': 1}
rpccmd = json.dumps(rpccmd)
result = xbmc.executeJSONRPC(rpccmd)
result = json.loads(result)
log('result=%s' % result)
log('episode_id=%s' % result['result']['episodedetails']['uniqueid']['unknown'])
result = json.loads(result)
log('resulto=%s' % result)

if 'unknown' in result['result']['episodedetails']['uniqueid']:
episode_id = result['result']['episodedetails']['uniqueid']['unknown']
elif 'tvdb' in result['result']['episodedetails']['uniqueid']:
episode_id = result['result']['episodedetails']['uniqueid']['tvdb']
else:
Copy link

@the-lazy-fox the-lazy-fox Apr 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

episode_id = result['result']['episodedetails']['uniqueid']['imdb'] may also exist. You should add an extra if for that.

episode_id = 0
log('episode_id=%s' % episode_id)

try:
item = {}
item['season'] = result['result']['episodedetails']['season']
item['tvshowid'] = result['result']['episodedetails']['tvshowid']
item['episode'] = result['result']['episodedetails']['episode']
item['showtitle'] = result['result']['episodedetails']['showtitle']
item['episode_id'] = result['result']['episodedetails']['uniqueid']['unknown']
item['episode_id'] = episode_id
return item
except:
return False
Expand Down