fix crash if datadir doesn't exist

bkiziuk · May 31, 2019 · d51ce6d · d51ce6d
1 parent 0fe1204
commit d51ce6d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 14 deletions.
diff --git a/addon.xml b/addon.xml
@@ -31,8 +31,9 @@
         <disclaimer lang="hu_HU">Egy teljeskörű felirat asszisztens</disclaimer>
         <disclaimer lang="pl_PL">Wszechstronny asystent napisów</disclaimer>
         <disclaimer lang="sk_SK">Kompletný sprievodca titukly</disclaimer>
-        <news>v1.4.1 (2019-05-08)
-- change definitions URL to update directly from SubsMagler master branch
+        <news>v1.4.1 (2019-06-01)
+- change definitions URL to update directly from SubsMangler master branch
+- fix creating data-dir before initiating external log file
 v1.4.0 (2019-04-06)
 - support for subtitles for internet streams
 v1.3.1 (2019-04-01)

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,6 @@
+v1.4.1 (2019-06-01)
+- change definitions URL to update directly from SubsMangler master branch
+- fix creating data-dir before initiating external log file
 v1.4.0 (2019-04-06)
 - support for subtitles for internet streams
 v1.3.1 (2019-04-01)

diff --git a/resources/lib/common.py b/resources/lib/common.py
@@ -23,6 +23,22 @@
 __addonlang__ = __addon__.getLocalizedString
 __kodiversion__ = xbmc.getInfoLabel('System.BuildVersion')[:4]
 
+
+
+# prepare datadir
+# directory and file is local to the filesystem
+# no need to use xbmcvfs
+if not os.path.isdir(__addonworkdir__):
+    xbmc.log("SubsMangler: profile directory doesn't exist: " + __addonworkdir__.encode('utf-8') + "   Trying to create.", level=xbmc.LOGNOTICE)
+    try:
+        os.mkdir(__addonworkdir__)
+        xbmc.log("SubsMangler: profile directory created: " + __addonworkdir__.encode('utf-8'), level=xbmc.LOGNOTICE)
+    except OSError as e:
+        xbmc.log("SubsMangler: Log: can't create directory: " + __addonworkdir__.encode('utf-8'), level=xbmc.LOGERROR)
+        xbmc.log("Exception: " + str(e.message).encode('utf-8'), xbmc.LOGERROR)
+
+
+
 # prepare external log handler
 # https://docs.python.org/2/library/logging.handlers.html
 global logger

diff --git a/resources/lib/smangler.py b/resources/lib/smangler.py
@@ -182,18 +182,6 @@ def PreparePlugin():
     global ClockTick
     ClockTick = 0
 
-    # prepare datadir
-    # directory and file is local to the filesystem
-    # no need to use xbmcvfs
-    if not os.path.isdir(common.__addonworkdir__):
-        xbmc.log("SubsMangler: profile directory doesn't exist: " + common.__addonworkdir__.encode('utf-8') + "   Trying to create.", level=xbmc.LOGNOTICE)
-        try:
-            os.mkdir(common.__addonworkdir__)
-            xbmc.log("SubsMangler: profile directory created: " + common.__addonworkdir__.encode('utf-8'), level=xbmc.LOGNOTICE)
-        except OSError as e:
-            xbmc.log("SubsMangler: Log: can't create directory: " + common.__addonworkdir__.encode('utf-8'), level=xbmc.LOGERROR)
-            xbmc.log("Exception: " + str(e.message).encode('utf-8'), xbmc.LOGERROR)
-
     # load settings
     common.GetSettings()