1 files changed, 26 insertions, 12 deletions

diff --git a/uv_magic_uv/__init__.py b/uv_magic_uv/__init__.py
index 63591526..61fcc804 100644
--- a/uv_magic_uv/__init__.py
+++ b/uv_magic_uv/__init__.py
@@ -27,8 +27,9 @@ __date__ = "17 Nov 2018"
 bl_info = {
     "name": "Magic UV",
     "author": "Nutti, Mifth, Jace Priester, kgeogeo, mem, imdjs"
-              "Keith (Wahooney) Boshoff, McBuff, MaxRobinot, Alexander Milovsky",
-    "version": (5, 3, 0),
+              "Keith (Wahooney) Boshoff, McBuff, MaxRobinot, "
+              "Alexander Milovsky",
+    "version": (6, 0, 0),
     "blender": (2, 80, 0),
     "location": "See Add-ons Preferences",
     "description": "UV Toolset. See Add-ons Preferences for details",
@@ -60,56 +61,69 @@ if "bpy" in locals():
     importlib.reload(utils)
     utils.bl_class_registry.BlClassRegistry.cleanup()
     if check_version(2, 80, 0) >= 0:
+        importlib.reload(lib)
         importlib.reload(op)
         importlib.reload(ui)
         importlib.reload(properites)
         importlib.reload(preferences)
-        importlib.reload(addon_updater_ops)
-        importlib.reload(addon_updater)
     else:
         importlib.reload(legacy)
+    importlib.reload(impl)
 else:
     import bpy
     from . import common
     from . import utils
     if check_version(2, 80, 0) >= 0:
+        from . import lib
         from . import op
         from . import ui
         from . import properites
         from . import preferences
-        from . import addon_updater_ops
-        from . import addon_updater
     else:
         from . import legacy
+    from . import impl
 
+import os
 
 import bpy
 
 
+def register_updater(bl_info):
+    config = utils.addon_updator.AddonUpdatorConfig()
+    config.owner = "nutti"
+    config.repository = "Magic-UV"
+    config.current_addon_path = os.path.dirname(os.path.realpath(__file__))
+    config.branches = ["master", "develop"]
+    config.addon_directory = config.current_addon_path[:config.current_addon_path.rfind("/")]
+    #config.min_release_version = bl_info["version"]
+    config.min_release_version = (5, 1)
+    config.target_addon_path = "uv_magic_uv"
+    updater = utils.addon_updator.AddonUpdatorManager.get_instance()
+    updater.init(bl_info, config)
+
+
 def register():
+    register_updater(bl_info)
+
     if common.check_version(2, 80, 0) >= 0:
         utils.bl_class_registry.BlClassRegistry.register()
         properites.init_props(bpy.types.Scene)
-        if preferences.Preferences.enable_builtin_menu:
+        if bpy.context.user_preferences.addons['uv_magic_uv'].preferences.enable_builtin_menu:
             preferences.add_builtin_menu()
     else:
         utils.bl_class_registry.BlClassRegistry.register()
         legacy.properites.init_props(bpy.types.Scene)
         if legacy.preferences.Preferences.enable_builtin_menu:
             legacy.preferences.add_builtin_menu()
-        if not common.is_console_mode():
-            addon_updater_ops.register(bl_info)
 
 
 def unregister():
     if common.check_version(2, 80, 0) >= 0:
-        if preferences.Preferences.enable_builtin_menu:
+        if bpy.context.user_preferences.addons['uv_magic_uv'].preferences.enable_builtin_menu:
             preferences.remove_builtin_menu()
         properites.clear_props(bpy.types.Scene)
         utils.bl_class_registry.BlClassRegistry.unregister()
     else:
-        if not common.is_console_mode():
-            addon_updater_ops.unregister()
         if legacy.preferences.Preferences.enable_builtin_menu:
             legacy.preferences.remove_builtin_menu()
         legacy.properites.clear_props(bpy.types.Scene)