Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2025-11-11 02:46:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix conflicts for merge

Browse source
This commit is contained in:
TrueTechy 2019-09-09 01:43:02 +01:00
commit 1e92e92888
6 changed files with 8 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

5
resources/lib/jellyfin/__init__.py
View file

@ -110,11 +110,6 @@ class Jellyfin(object):
def __getattr__(self, name):
return getattr(self.client[self.server_id], name)
@ensure_client()
def __getitem__(self, key):
LOG.debug("__getitem__(%r)", key)
return self.client[self.server_id][key]
def construct(self):
self.client[self.server_id] = JellyfinClient()

8
resources/lib/jellyfin/core/http.py
View file

@ -122,11 +122,19 @@ class HTTP(object):
if r.status_code == 401:
if 'X-Application-Error-Code' in r.headers:
<<<<<<< HEAD
self.client.callback("AccessRestricted", {'ServerId': self.config.data['auth.server-id']})
raise HTTPException("AccessRestricted", error)
else:
self.client.callback("Unauthorized", {'ServerId': self.config.data['auth.server-id']})
=======
self.client['callback']("AccessRestricted", {'ServerId': self.config.data['auth.server-id']})
raise HTTPException("AccessRestricted", error)
else:
self.client['callback']("Unauthorized", {'ServerId': self.config.data['auth.server-id']})
>>>>>>> 8268ec3f44657ec4dc448a8a02bbb51841972be9
self.client.auth.revoke_token()
raise HTTPException("Unauthorized", error)

12
resources/lib/objects/movies.py
View file

@ -34,18 +34,6 @@ class Movies(KodiDb):
KodiDb.__init__(self, videodb.cursor)
def __getitem__(self, key):
LOG.debug("__getitem__(%r)", key)
if key == 'Movie':
return self.movie
elif key == 'BoxSet':
return self.boxset
elif key == 'UserData':
return self.userdata
elif key in 'Removed':
return self.remove
@stop()
@jellyfin_item()
@library_check()

14
resources/lib/objects/music.py
View file

@ -34,20 +34,6 @@ class Music(KodiDb):
KodiDb.__init__(self, musicdb.cursor)
def __getitem__(self, key):
LOG.debug("__getitem__(%r)", key)
if key in ('MusicArtist', 'AlbumArtist'):
return self.artist
elif key == 'MusicAlbum':
return self.album
elif key == 'Audio':
return self.song
elif key == 'UserData':
return self.userdata
elif key in 'Removed':
return self.remove
@stop()
@jellyfin_item()
@library_check()

10
resources/lib/objects/musicvideos.py
View file

@ -34,16 +34,6 @@ class MusicVideos(KodiDb):
KodiDb.__init__(self, videodb.cursor)
def __getitem__(self, key):
LOG.debug("__getitem__(%r)", key)
if key == 'MusicVideo':
return self.musicvideo
elif key == 'UserData':
return self.userdata
elif key in 'Removed':
return self.remove
@stop()
@jellyfin_item()
@library_check()

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

@ -37,20 +37,6 @@ class TVShows(KodiDb):
KodiDb.__init__(self, videodb.cursor)
def __getitem__(self, key):
LOG.debug("__getitem__(%r)", key)
if key == 'Series':
return self.tvshow
elif key == 'Season':
return self.season
elif key == 'Episode':
return self.episode
elif key == 'UserData':
return self.userdata
elif key in 'Removed':
return self.remove
@stop()
@jellyfin_item()
@library_check()