Renamed core plugin paths, bump version

app/plugins/functions.py

@@ -194,11 +194,11 @@ def get_plugins():
                     if settings.TESTING:
                         module = importlib.import_module("app.media_test.plugins.{}".format(dir))
                     else:
-                        module = importlib.import_module("app.media.plugins.{}".format(dir))
+                        module = importlib.import_module("plugins.{}".format(dir))
 
                     plugin = (getattr(module, "Plugin"))()
                 except (ImportError, AttributeError):
-                    module = importlib.import_module("plugins.{}".format(dir))
+                    module = importlib.import_module("coreplugins.{}".format(dir))
                     plugin = (getattr(module, "Plugin"))()
 
                 # Check version
@@ -284,7 +284,7 @@ def get_plugins_paths():
     current_path = os.path.dirname(os.path.realpath(__file__))
     return [
         os.path.abspath(get_plugins_persistent_path()),
-        os.path.abspath(os.path.join(current_path, "..", "..", "plugins")),
+        os.path.abspath(os.path.join(current_path, "..", "..", "coreplugins")),
     ]
 
 def get_plugins_persistent_path(*paths):

app/plugins/plugin_base.py

@@ -131,7 +131,11 @@ class PluginBase(ABC):
         :param path: unix-style path
         :return: path used to reference Django templates for a plugin
         """
-        return "plugins/{}/templates/{}".format(self.get_name(), path)
+        if self.is_persistent():
+            return "coreplugins/{}/templates/{}".format(self.get_name(), path)
+        else:
+            return "plugins/{}/templates/{}".format(self.get_name(), path)
+
 
     def path_exists(self, path):
         return os.path.exists(self.get_path(path))

coreplugins/cesiumion/uploader.py

@@ -19,7 +19,7 @@ def upload_to_ion(
     from shutil import rmtree
     from enum import Enum
     from app.plugins import logger
-    from plugins.cesiumion.api_views import (
+    from .api_views import (
         get_asset_info,
         set_asset_info,
         AssetType,
@@ -28,11 +28,11 @@ def upload_to_ion(
         ASSET_TO_FILE,
         pluck,
         )
-    from plugins.cesiumion.model_tools import (
+    from .model_tools import (
         to_ion_texture_model, 
         IonInvalidZip,
         )
-    from plugins.cesiumion.globals import ION_API_URL
+    from .globals import ION_API_URL
     class LoggerAdapter(logging.LoggerAdapter):
         def __init__(self, prefix, logger):
             super().__init__(logger, {})

coreplugins/cloudimport/platform_extension.py

@@ -1,6 +1,6 @@
 from abc import ABC, abstractmethod
 from app.plugins import get_current_plugin
-from .cloud_platform import CloudPlatform
+from coreplugins.cloudimport.cloud_platform import CloudPlatform
 
 class PlatformExtension(CloudPlatform):
     """A platform extension is a platform with extra capacities. It may require extra configuration, or it might provide new features."""

coreplugins/cloudimport/platform_helper.py

@@ -28,7 +28,7 @@ def read_platform_from_files():
         # Each python script must have a class called Platform
         # Instantiate the platform
         try:
-            module_path = "plugins.cloudimport.platforms.{}".format(path.splitext(platform_script)[0])
+            module_path = "coreplugins.cloudimport.platforms.{}".format(path.splitext(platform_script)[0])
             module = importlib.import_module(module_path)
             platform = (getattr(module, "Platform"))()
             platforms.append(platform)

coreplugins/cloudimport/platforms/github.py

@@ -1,7 +1,7 @@
 # Check https://github.com/
 from urllib.parse import urlparse
 from os import path
-from plugins.cloudimport.cloud_platform import File, Folder, CloudPlatform
+from coreplugins.cloudimport.cloud_platform import File, Folder, CloudPlatform
 from app.plugins import logger
 
 class Platform(CloudPlatform):

coreplugins/cloudimport/platforms/piwigo.py

@@ -1,8 +1,8 @@
 # Check http://piwigo.com/
 from urllib.parse import urlparse
 from os import path
-from plugins.cloudimport.cloud_platform import File, Folder
-from plugins.cloudimport.extensions.cloud_library import CloudLibrary
+from coreplugins.cloudimport.cloud_platform import File, Folder
+from coreplugins.cloudimport.extensions.cloud_library import CloudLibrary
 
 class Platform(CloudLibrary):
     def __init__(self):