Fix conflicts for merge

resources/lib/jellyfin/__init__.py

@@ -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()

resources/lib/jellyfin/core/http.py

@@ -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)

resources/lib/objects/movies.py

@@ -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()

resources/lib/objects/music.py

@@ -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()

resources/lib/objects/musicvideos.py

@@ -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()

resources/lib/objects/tvshows.py

@@ -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()