changed plugins url handling

the url settings of pyscada plugins will be added to the global urls
config automaticly

docs/django_settings.rst

@@ -21,7 +21,7 @@ Open the urls configuration file and add the necessary rewrite rule to the djang
 
     urlpatterns = [
         url(r'^admin/', admin.site.urls),
-        url(r'^', include('pyscada.hmi.urls')),
+        url(r'^', include('pyscada.core.urls')),
     ]
     ...
 

extras/settings.py

@@ -43,6 +43,7 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'pyscada',
+    'pyscada.core',
     'pyscada.hmi',
     'pyscada.export',
 ]

extras/urls.py

@@ -16,33 +16,6 @@
 from django.urls import path, include
 from django.contrib import admin
 
-from pkgutil import iter_modules
-from importlib.util import find_spec
-import pyscada
-
-
-def list_submodules(module):
-    submodules = []
-    for submodule in iter_modules(module.__path__):
-        submodules.append(submodule)
-    return submodules
-
-
 urlpatterns = [
-    path('admin/', admin.site.urls),
-]
-
-
-lsm = list_submodules(pyscada)
-for m in lsm:
-    try:
-        if m.name != 'hmi' and find_spec('pyscada.' + m.name + '.urls'):
-            urlpatterns += [
-                path('', include('pyscada.' + m.name + '.urls')),
-            ]
-    except:
-        pass
-
-urlpatterns += [
     path('', include('pyscada.hmi.urls')),
 ]

pyscada/core/urls.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.apps import apps
+import logging
+
+logger = logging.getLogger(__name__)
+
+urlpatterns = []
+
+for app in apps.app_configs.values():
+    if app.name.startswith('pyscada.') and app.name != "pyscada.core":
+
+        try:
+            m = __import__(f"{app.name}.urls", fromlist=[str('a')])
+            urlpatterns += m.urlpatterns
+
+        except Exception as e:
+            logger.warning(e, exc_info=True)
+

tests/project_template/project_name/settings.py-tpl

@@ -41,6 +41,7 @@ INSTALLED_APPS = [
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'pyscada',
+    'pyscada.core',
     'pyscada.hmi',
     'pyscada.export',
     {{ additional_apps }}

tests/project_template/project_name/urls.py-tpl

@@ -16,33 +16,6 @@ Including another URLconf
 from django.urls import path, include
 from django.contrib import admin
 
-from pkgutil import iter_modules
-from importlib.util import find_spec
-import pyscada
-
-
-def list_submodules(module):
-    submodules = []
-    for submodule in iter_modules(module.__path__):
-        submodules.append(submodule)
-    return submodules
-
-
 urlpatterns = [
-    path('admin/', admin.site.urls),
-]
-
-
-lsm = list_submodules(pyscada)
-for m in lsm:
-    try:
-        if m.name != 'hmi' and find_spec('pyscada.' + m.name + '.urls'):
-            urlpatterns += [
-                path('', include('pyscada.' + m.name + '.urls')),
-            ]
-    except:
-        pass
-
-urlpatterns += [
-    path('', include('pyscada.hmi.urls')),
+    path('', include('pyscada.core.urls')),
 ]