Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2024-12-25 18:26:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

krypton update

Browse source
This commit is contained in:
angelblue05 2018-10-12 20:10:33 -05:00
parent bc07da703a
commit 0d5a89757f
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/lib/objects/__init__.py
View file

@ -1,4 +1,4 @@
version = "171076019" version = "171076021"
from movies import Movies from movies import Movies
from musicvideos import MusicVideos from musicvideos import MusicVideos

7
resources/lib/objects/actions.py
View file

@ -99,14 +99,13 @@ class Actions(object):
if get_play_action() == "Resume": if get_play_action() == "Resume":
seektime = True seektime = True
if transcode and not seektime and resume: if transcode and not seektime:
choice = self.resume_dialog(api.API(item, self.server).adjust_resume((resume or 0) / 10000000.0)) choice = self.resume_dialog(api.API(item, self.server).adjust_resume((resume or 0) / 10000000.0))
if choice is None: if choice is None:
return raise Exception("User backed out of resume dialog.")
elif not choice: seektime = False if not choice else True
seektime = False
if settings('enableCinema.bool') and not seektime: if settings('enableCinema.bool') and not seektime:
self._set_intros(item) self._set_intros(item)

13
resources/lib/objects/tvshows.py
View file

@ -4,8 +4,9 @@
import json import json
import logging import logging
from ntpath import dirname import sqlite3
import urllib import urllib
from ntpath import dirname
from obj import Objects from obj import Objects
from kodi import TVShows as KodiDb, queries as QU from kodi import TVShows as KodiDb, queries as QU
@ -325,7 +326,7 @@ class TVShows(KodiDb):
obj['AirsBeforeEpisode'] = 4096 # Kodi default number for afterseason ordering obj['AirsBeforeEpisode'] = 4096 # Kodi default number for afterseason ordering
if obj['MultiEpisode']: if obj['MultiEpisode']:
obj['MultiEpisode'] = "| %02d | %s" % (obj['MultiEpisode'], obj['Title']) obj['Title'] = "| %02d | %s" % (obj['MultiEpisode'], obj['Title'])
if not self.get_show_id(obj): if not self.get_show_id(obj):
return False return False
@ -371,7 +372,15 @@ class TVShows(KodiDb):
obj['PathId'] = self.add_path(*values(obj, QU.add_path_obj)) obj['PathId'] = self.add_path(*values(obj, QU.add_path_obj))
obj['FileId'] = self.add_file(*values(obj, QU.add_file_obj)) obj['FileId'] = self.add_file(*values(obj, QU.add_file_obj))
try:
self.add_episode(*values(obj, QU.add_episode_obj)) self.add_episode(*values(obj, QU.add_episode_obj))
except sqlite3.IntegrityError as error:
LOG.error("IntegrityError for %s", obj)
obj['EpisodeId'] = self.create_entry_episode()
return self.episode_add(obj)
self.emby_db.add_reference(*values(obj, QUEM.add_reference_episode_obj)) self.emby_db.add_reference(*values(obj, QUEM.add_reference_episode_obj))
LOG.debug("ADD episode [%s/%s] %s: %s", obj['PathId'], obj['FileId'], obj['Id'], obj['Title']) LOG.debug("ADD episode [%s/%s] %s: %s", obj['PathId'], obj['FileId'], obj['Id'], obj['Title'])