Magic UV: Release v6.2

Fix bugs

5 files changed, 34 insertions, 22 deletions

diff --git a/magic_uv/utils/__init__.py b/magic_uv/utils/__init__.py
index 8b99470e..0e6ef744 100644
--- a/magic_uv/utils/__init__.py
+++ b/magic_uv/utils/__init__.py
@@ -20,17 +20,17 @@
 
 __author__ = "Nutti <nutti.metro@gmail.com>"
 __status__ = "production"
-__version__ = "6.1"
-__date__ = "19 May 2019"
+__version__ = "6.2"
+__date__ = "31 Jul 2019"
 
 if "bpy" in locals():
     import importlib
-    importlib.reload(addon_updator)
+    importlib.reload(addon_updater)
     importlib.reload(bl_class_registry)
     importlib.reload(compatibility)
     importlib.reload(property_class_registry)
 else:
-    from . import addon_updator
+    from . import addon_updater
     from . import bl_class_registry
     from . import compatibility
     from . import property_class_registry
diff --git a/magic_uv/utils/addon_updator.py b/magic_uv/utils/addon_updater.py
index 1ef522fb..2f3d0c0f 100644
--- a/magic_uv/utils/addon_updator.py
+++ b/magic_uv/utils/addon_updater.py
@@ -20,8 +20,8 @@
 
 __author__ = "Nutti <nutti.metro@gmail.com>"
 __status__ = "production"
-__version__ = "6.1"
-__date__ = "19 May 2019"
+__version__ = "6.2"
+__date__ = "31 Jul 2019"
 
 from threading import Lock
 import urllib
@@ -75,7 +75,7 @@ def _download(url, path):
 
 
 def _make_workspace_path(addon_dir):
-    return addon_dir + get_separator() + "addon_updator_workspace"
+    return addon_dir + get_separator() + "addon_updater_workspace"
 
 
 def _make_workspace(addon_dir):
@@ -161,7 +161,7 @@ def _compare_version(ver1, ver2):
     return comp(ver1, ver2, 0)
 
 
-class AddonUpdatorConfig:
+class AddonUpdaterConfig:
     def __init__(self):
         # Name of owner
         self.owner = ""
@@ -179,7 +179,13 @@ class AddonUpdatorConfig:
         self.min_release_version = (-1, -1)
 
         # Target add-on path
-        self.target_addon_path = ""
+        # {"branch/tag": "add-on path"}
+        self.target_addon_path = {}
+
+        # Default target add-on path.
+        # Search this path if branch/tag is not found in
+        # self.target_addon_path.
+        self.default_target_addon_path = ""
 
         # Current add-on path
         self.current_addon_path = ""
@@ -195,7 +201,7 @@ class UpdateCandidateInfo:
         self.group = ""   # BRANCH|RELEASE
 
 
-class AddonUpdatorManager:
+class AddonUpdaterManager:
     __inst = None
     __lock = Lock()
 
@@ -240,7 +246,7 @@ class AddonUpdatorManager:
 
     def check_update_candidate(self):
         if not self.initialized():
-            raise RuntimeError("AddonUpdatorManager must be initialized")
+            raise RuntimeError("AddonUpdaterManager must be initialized")
 
         self.__update_candidate = []
         self.__candidate_checked = False
@@ -293,7 +299,7 @@ class AddonUpdatorManager:
 
     def update(self, version_name):
         if not self.initialized():
-            raise RuntimeError("AddonUpdatorManager must be initialized.")
+            raise RuntimeError("AddonUpdaterManager must be initialized.")
 
         if not self.candidate_checked():
             raise RuntimeError("Update candidate is not checked.")
@@ -315,14 +321,20 @@ class AddonUpdatorManager:
             # download add-on
             _download_addon(self.__config.addon_directory, info.url)
 
+            # get add-on path
+            if info.name in self.__config.target_addon_path:
+                addon_path = self.__config.target_addon_path[info.name]
+            else:
+                addon_path = self.__config.default_target_addon_path
+
             # replace add-on
             offset_path = ""
             if info.group == 'BRANCH':
                 offset_path = "{}-{}{}{}".format(
                     self.__config.repository, info.name, get_separator(),
-                    self.__config.target_addon_path)
+                    addon_path)
             elif info.group == 'RELEASE':
-                offset_path = self.__config.target_addon_path
+                offset_path = addon_path
             _replace_addon(self.__config.addon_directory,
                            info, self.__config.current_addon_path,
                            offset_path)
@@ -337,7 +349,7 @@ class AddonUpdatorManager:
 
     def get_candidate_branch_names(self):
         if not self.initialized():
-            raise RuntimeError("AddonUpdatorManager must be initialized.")
+            raise RuntimeError("AddonUpdaterManager must be initialized.")
 
         if not self.candidate_checked():
             raise RuntimeError("Update candidate is not checked.")
diff --git a/magic_uv/utils/bl_class_registry.py b/magic_uv/utils/bl_class_registry.py
index 0cd86600..826f1483 100644
--- a/magic_uv/utils/bl_class_registry.py
+++ b/magic_uv/utils/bl_class_registry.py
@@ -20,8 +20,8 @@
 
 __author__ = "Nutti <nutti.metro@gmail.com>"
 __status__ = "production"
-__version__ = "6.1"
-__date__ = "19 May 2019"
+__version__ = "6.2"
+__date__ = "31 Jul 2019"
 
 import bpy
 
diff --git a/magic_uv/utils/compatibility.py b/magic_uv/utils/compatibility.py
index 9cd754aa..6b7da000 100644
--- a/magic_uv/utils/compatibility.py
+++ b/magic_uv/utils/compatibility.py
@@ -20,8 +20,8 @@
 
 __author__ = "Nutti <nutti.metro@gmail.com>"
 __status__ = "production"
-__version__ = "6.1"
-__date__ = "19 May 2019"
+__version__ = "6.2"
+__date__ = "31 Jul 2019"
 
 import bpy
 import bgl
@@ -81,7 +81,7 @@ def matmul(m1, m2):
 
 def layout_split(layout, factor=0.0, align=False):
     if check_version(2, 80, 0) < 0:
-        return layout.split(factor=factor, align=align)
+        return layout.split(percentage=factor, align=align)
 
     return layout.split(factor=factor, align=align)
 
diff --git a/magic_uv/utils/property_class_registry.py b/magic_uv/utils/property_class_registry.py
index 6cf5f6a8..dff4712f 100644
--- a/magic_uv/utils/property_class_registry.py
+++ b/magic_uv/utils/property_class_registry.py
@@ -20,8 +20,8 @@
 
 __author__ = "Nutti <nutti.metro@gmail.com>"
 __status__ = "production"
-__version__ = "6.1"
-__date__ = "19 May 2019"
+__version__ = "6.2"
+__date__ = "31 Jul 2019"
 
 from .. import common