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

Cleanup __shortcuts__ in client.py and associated code (#66)

Browse source 
* client.py - remove "connected"

* client.py - remove "config" & configuration.py - removed shortcuts and get/set item functions

* client.py - remove "auth" & connection_manager.py - remove __shortcuts__ & __getitem__

* client.py - remove "auth" & connection_manager.py - remove __shortcuts__ & __getitem__

* client.py - remove "callback"

* client.py - remove "websocket" and __getitem__ & ws_client.py - remove __shortcuts__

* Fix rebase mess-up
This commit is contained in:
Abby 2019-09-09 01:20:58 +01:00 • committed by mcarlton00
commit 4049023559
19 changed files with 134 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,7 +54,9 @@ class Movies(KodiDb):
''' If item does not exist, entry will be added.
If item exists, entry will be updated.
'''
API = api.API(item, self.server['auth/server-address'])
server_data = self.server.auth.get_server_info(self.server.auth.server_id)
server_address = self.server.auth.get_server_address(server_data, server_data['LastConnectionMode'])
API = api.API(item, server_address)
obj = self.objects.map(item, 'Movie')
update = True
@ -213,7 +215,9 @@ class Movies(KodiDb):
Process movies inside boxset.
Process removals from boxset.
'''
API = api.API(item, self.server['auth/server-address'])
server_data = self.server.auth.get_server_info(self.server.auth.server_id)
server_address = self.server.auth.get_server_address(server_data, server_data['LastConnectionMode'])
API = api.API(item, server_address)
obj = self.objects.map(item, 'Boxset')
obj['Overview'] = API.get_overview(obj['Overview'])
@ -291,7 +295,9 @@ class Movies(KodiDb):
''' This updates: Favorite, LastPlayedDate, Playcount, PlaybackPositionTicks
Poster with progress bar
'''
API = api.API(item, self.server['auth/server-address'])
server_data = self.server.auth.get_server_info(self.server.auth.server_id)
server_address = self.server.auth.get_server_address(server_data, server_data['LastConnectionMode'])
API = api.API(item, server_address)
obj = self.objects.map(item, 'MovieUserData')
try:

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

@ -56,7 +56,9 @@ class Music(KodiDb):
''' If item does not exist, entry will be added.
If item exists, entry will be updated.
'''
API = api.API(item, self.server['auth/server-address'])
server_data = self.server.auth.get_server_info(self.server.auth.server_id)
server_address = self.server.auth.get_server_address(server_data, server_data['LastConnectionMode'])
API = api.API(item, server_address)
obj = self.objects.map(item, 'Artist')
update = True
@ -125,7 +127,9 @@ class Music(KodiDb):
''' Update object to kodi.
'''
API = api.API(item, self.server['auth/server-address'])
server_data = self.server.auth.get_server_info(self.server.auth.server_id)
server_address = self.server.auth.get_server_address(server_data, server_data['LastConnectionMode'])
API = api.API(item, server_address)
obj = self.objects.map(item, 'Album')
update = True
@ -234,7 +238,9 @@ class Music(KodiDb):
''' Update object to kodi.
'''
API = api.API(item, self.server['auth/server-address'])
server_data = self.server.auth.get_server_info(self.server.auth.server_id)
server_address = self.server.auth.get_server_address(server_data, server_data['LastConnectionMode'])
API = api.API(item, server_address)
obj = self.objects.map(item, 'Song')
update = True
@ -352,7 +358,9 @@ class Music(KodiDb):
obj['Path'] = obj['Path'].replace(obj['Filename'], "")
else:
obj['Path'] = "%s/emby/Audio/%s/" % (self.server['auth/server-address'], obj['Id'])
server_data = self.server.auth.get_server_info(self.server.auth.server_id)
server_address = self.server.auth.get_server_address(server_data, server_data['LastConnectionMode'])
obj['Path'] = "%s/emby/Audio/%s/" % (server_address, obj['Id'])
obj['Filename'] = "stream.%s?static=true" % obj['Container']
def song_artist_discography(self, obj):
@ -429,7 +437,9 @@ class Music(KodiDb):
''' This updates: Favorite, LastPlayedDate, Playcount, PlaybackPositionTicks
Poster with progress bar
'''
API = api.API(item, self.server['auth/server-address'])
server_data = self.server.auth.get_server_info(self.server.auth.server_id)
server_address = self.server.auth.get_server_address(server_data, server_data['LastConnectionMode'])
API = api.API(item, server_address)
obj = self.objects.map(item, 'SongUserData')
try:

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

@ -55,7 +55,9 @@ class MusicVideos(KodiDb):
If we don't get the track number from Jellyfin, see if we can infer it
from the sortname attribute.
'''
API = api.API(item, self.server['auth/server-address'])
server_data = self.server.auth.get_server_info(self.server.auth.server_id)
server_address = self.server.auth.get_server_address(server_data, server_data['LastConnectionMode'])
API = api.API(item, server_address)
obj = self.objects.map(item, 'MusicVideo')
update = True
@ -192,7 +194,9 @@ class MusicVideos(KodiDb):
''' This updates: Favorite, LastPlayedDate, Playcount, PlaybackPositionTicks
Poster with progress bar
'''
API = api.API(item, self.server['auth/server-address'])
server_data = self.server.auth.get_server_info(self.server.auth.server_id)
server_address = self.server.auth.get_server_address(server_data, server_data['LastConnectionMode'])
API = api.API(item, server_address)
obj = self.objects.map(item, 'MusicVideoUserData')
try:

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

@ -63,7 +63,9 @@ class TVShows(KodiDb):
Process seasons.
Apply series pooling.
'''
API = api.API(item, self.server['auth/server-address'])
server_data = self.server.auth.get_server_info(self.server.auth.server_id)
server_address = self.server.auth.get_server_address(server_data, server_data['LastConnectionMode'])
API = api.API(item, server_address)
obj = self.objects.map(item, 'Series')
update = True
@ -230,7 +232,9 @@ class TVShows(KodiDb):
If the show is empty, try to remove it.
'''
API = api.API(item, self.server['auth/server-address'])
server_data = self.server.auth.get_server_info(self.server.auth.server_id)
server_address = self.server.auth.get_server_address(server_data, server_data['LastConnectionMode'])
API = api.API(item, server_address)
obj = self.objects.map(item, 'Season')
obj['ShowId'] = show_id
@ -265,7 +269,9 @@ class TVShows(KodiDb):
Create additional entry for widgets.
This is only required for plugin/episode.
'''
API = api.API(item, self.server['auth/server-address'])
server_data = self.server.auth.get_server_info(self.server.auth.server_id)
server_address = self.server.auth.get_server_address(server_data, server_data['LastConnectionMode'])
API = api.API(item, server_address)
obj = self.objects.map(item, 'Episode')
update = True
@ -459,7 +465,9 @@ class TVShows(KodiDb):
Make sure there's no other bookmarks created by widget.
Create additional entry for widgets. This is only required for plugin/episode.
'''
API = api.API(item, self.server['auth/server-address'])
server_data = self.server.auth.get_server_info(self.server.auth.server_id)
server_address = self.server.auth.get_server_address(server_data, server_data['LastConnectionMode'])
API = api.API(item, server_address)
obj = self.objects.map(item, 'EpisodeUserData')
try: