Merge pull request #201 from angelblue05/develop

Fixes for playback

addon.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon  id="plugin.video.emby"
         name="Emby" 
-        version="4.0.1"
+        version="4.0.2"
         provider-name="angelblue05">
   <requires>
     <import addon="xbmc.python" version="2.25.0"/>
-    <import addon="plugin.video.emby.movies" version="0.13" />
+    <import addon="plugin.video.emby.movies" version="0.14" />
-    <import addon="plugin.video.emby.tvshows" version="0.13" />
+    <import addon="plugin.video.emby.tvshows" version="0.14" />
-    <import addon="plugin.video.emby.musicvideos" version="0.13" />
+    <import addon="plugin.video.emby.musicvideos" version="0.14" />
   </requires>
   <extension    point="xbmc.python.pluginsource"
                 library="default.py">
@@ -38,8 +38,11 @@
     <description lang="en">Welcome to Emby for Kodi A whole new way to manage and view your media library. The Emby addon for Kodi combines the best of Kodi - ultra smooth navigation, beautiful UIs and playback of any file under the sun, and Emby - the most powerful fully open source multi-client media metadata indexer and server.&#10;&#10;Emby for Kodi is the absolute best way to enjoy the incredible Kodi playback engine combined with the power of Emby's centralized database. Features: Direct integration with the Kodi library for native Kodi speed Instant synchronization with the Emby server Full support for Movie, TV and Music collections Emby Server direct stream and transcoding support - use Kodi when you are away from home!</description>
     <news>
       New stable release
-      The wiki has been updated: https://github.com/MediaBrowser/plugin.video.emby/wiki
+      The wiki has been updated, PLEASE READ: https://github.com/MediaBrowser/plugin.video.emby/wiki
-      Small fixes
+      Fix playback for Kodi Leia
+      Fix masterlock
+      Home videos and pictures now show under videos and picture add-ons
+      Dependencies were updated to 0.14!
     </news>
   </extension>
 </addon>

context.py

@@ -13,11 +13,13 @@ import xbmcaddon
 
 __addon__ = xbmcaddon.Addon(id='plugin.video.emby')
 __base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'resources', 'lib')).decode('utf-8')
+__libraries__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'librarie')).decode('utf-8')
 __pcache__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('profile'), 'emby')).decode('utf-8')
 __cache__ = xbmc.translatePath('special://temp/emby').decode('utf-8')
 
 sys.path.insert(0, __cache__)
 sys.path.insert(0, __pcache__)
+sys.path.insert(0, __libraries__)
 sys.path.append(__base__)
 
 #################################################################################################

context_play.py

@@ -13,11 +13,13 @@ import xbmcaddon
 
 __addon__ = xbmcaddon.Addon(id='plugin.video.emby')
 __base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'resources', 'lib')).decode('utf-8')
+__libraries__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'libraries')).decode('utf-8')
 __pcache__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('profile'), 'emby')).decode('utf-8')
 __cache__ = xbmc.translatePath('special://temp/emby').decode('utf-8')
 
 sys.path.insert(0, __cache__)
 sys.path.insert(0, __pcache__)
+sys.path.insert(0, __libraries__)
 sys.path.append(__base__)
 
 #################################################################################################

default.py

@@ -13,11 +13,13 @@ import xbmcaddon
 
 __addon__ = xbmcaddon.Addon(id='plugin.video.emby')
 __base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'resources', 'lib')).decode('utf-8')
+__libraries__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'libraries')).decode('utf-8')
 __pcache__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('profile'), 'emby')).decode('utf-8')
 __cache__ = xbmc.translatePath('special://temp/emby').decode('utf-8')
 
 sys.path.insert(0, __cache__)
 sys.path.insert(0, __pcache__)
+sys.path.insert(0, __libraries__)
 sys.path.append(__base__)
 
 #################################################################################################

libraries/dateutil/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 try:
-    from ._version import version as __version__
+    from _version import version as __version__
 except ImportError:
     __version__ = 'unknown'
 

libraries/dateutil/parser/__init__.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
-from ._parser import parse, parser, parserinfo
+from _parser import parse, parser, parserinfo
-from ._parser import DEFAULTPARSER, DEFAULTTZPARSER
+from _parser import DEFAULTPARSER, DEFAULTTZPARSER
-from ._parser import UnknownTimezoneWarning
+from _parser import UnknownTimezoneWarning
 
-from ._parser import __doc__
+from _parser import __doc__
 
-from .isoparser import isoparser, isoparse
+from isoparser import isoparser, isoparse
 
 __all__ = ['parse', 'parser', 'parserinfo',
            'isoparse', 'isoparser',

libraries/dateutil/parser/_parser.py

@@ -39,15 +39,15 @@ import warnings
 from calendar import monthrange
 from io import StringIO
 
-from .. import six
+import six
-from ..six import binary_type, integer_types, text_type
+from six import binary_type, integer_types, text_type
 
 from decimal import Decimal
 
 from warnings import warn
 
-from .. import relativedelta
+from dateutil import relativedelta
-from .. import tz
+from dateutil import tz
 
 __all__ = ["parse", "parserinfo"]
 

libraries/dateutil/parser/isoparser.py

@@ -9,12 +9,12 @@ ISO-8601 specification.
 """
 from datetime import datetime, timedelta, time, date
 import calendar
-from .. import tz
+from dateutil import tz
 
 from functools import wraps
 
 import re
-from .. import six
+import six
 
 __all__ = ["isoparse", "isoparser"]
 

libraries/dateutil/tz/_common.py

@@ -1,4 +1,4 @@
-from ..six import PY3
+from six import PY3
 
 from functools import wraps
 

libraries/dateutil/tz/tz.py

@@ -14,17 +14,17 @@ import sys
 import os
 import bisect
 
-from .. import six
+import six
-from ..six import string_types
+from six import string_types
-from ..six.moves import _thread
+from six.moves import _thread
-from ._common import tzname_in_python2, _tzinfo
+from _common import tzname_in_python2, _tzinfo
-from ._common import tzrangebase, enfold
+from _common import tzrangebase, enfold
-from ._common import _validate_fromutc_inputs
+from _common import _validate_fromutc_inputs
 
-from ._factories import _TzSingleton, _TzOffsetFactory
+from _factories import _TzSingleton, _TzOffsetFactory
-from ._factories import _TzStrFactory
+from _factories import _TzStrFactory
 try:
-    from .win import tzwin, tzwinlocal
+    from win import tzwin, tzwinlocal
 except ImportError:
     tzwin = tzwinlocal = None