start thread on runserver

Signed-off-by: okkype <okkype@gmail.com>
okkype · Jun 26, 2019 · a3fecc0 · a3fecc0
1 parent 99b9beb
commit a3fecc0
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 43 deletions.
diff --git a/sihipo/settings.py b/sihipo/settings.py
@@ -30,6 +30,7 @@
 # Application definition
 
 INSTALLED_APPS = [
+    'sihipo_root',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -39,7 +40,7 @@
     'bootstrap3',
     'django_nvd3',
     'pwa',
-    'sihipo_root.apps.SihipoRootConfig',
+#     'sihipo_root.apps.SihipoRootConfig',
 ]
 
 MIDDLEWARE = [
@@ -119,7 +120,10 @@
 # https://docs.djangoproject.com/en/1.11/howto/static-files/
 
 STATIC_URL = '/static/'
-# STATIC_ROOT = '/home/okky/Dokumen/projek/sihipo/sihipo/static/'
+STATIC_ROOT = os.path.join(BASE_DIR, 'sihipo/static/')
+STATICFILES_DIRS = [
+    os.path.join(BASE_DIR, 'sihipo_root/static/'),
+]
 
 PWA_SERVICE_WORKER_PATH = os.path.join(BASE_DIR, 'sihipo_root/static/js', 'serviceworker.js')
 PWA_APP_NAME = 'SIHIPO'

diff --git a/sihipo_root/management/__init__.py b/sihipo_root/management/__init__.py
diff --git a/sihipo_root/management/commands/__init__.py b/sihipo_root/management/commands/__init__.py
diff --git a/sihipo_root/management/commands/_private.py b/sihipo_root/management/commands/_private.py
@@ -0,0 +1,5 @@
+'''
+Created on 26 Jun 2019
+
+@author: alif
+'''
diff --git a/sihipo_root/management/commands/runserver.py b/sihipo_root/management/commands/runserver.py
@@ -0,0 +1,44 @@
+'''
+Created on 26 Jun 2019
+
+@author: alif
+'''
+from django.contrib.staticfiles.management.commands.runserver import (
+    Command as StaticRunserverCommand
+)
+from sihipo_root.threads import *
+import threading
+
+
+class Command(StaticRunserverCommand):
+
+#     def handle(self, *args, **options):
+#         super(Command, self).handle(*args, **options)
+
+    def inner_run(self, *args, **options):
+        thread_sensor_run = False
+        thread_control_run = False
+        thread_eval_run = False
+
+        for t in threading.enumerate():
+            if t.getName() == 'thread_sensor':
+                thread_sensor_run = True
+            if t.getName() == 'thread_control':
+                thread_control_run = True
+            if t.getName() == 'thread_eval':
+                thread_eval_run = True
+
+        if not thread_sensor_run:
+            tf_sensor = SensorThread(interval=36000)
+            tf_sensor.start()
+            self.stdout.write(self.style.SUCCESS('Successfully start Sensor Thread'))
+        if not thread_control_run:
+            tf_control = ControlThread()
+            tf_control.start()
+            self.stdout.write(self.style.SUCCESS('Successfully start Control Thread'))
+        if not thread_eval_run:
+            tf_eval = EvalThread()
+            tf_eval.start()
+            self.stdout.write(self.style.SUCCESS('Successfully start Eval Thread'))
+        self.stdout.write('')
+        super(Command, self).inner_run(*args, **options)
diff --git a/sihipo_root/templates/blank.html b/sihipo_root/templates/blank.html
@@ -240,21 +240,20 @@ <h3 class="page-header">
             function pwa_link() {
                 $('a[href^="/"]').each(function(){ 
                     var oldUrl = $(this).attr("href");
-                    if(oldUrl.startsWith('/#target=')) {
+                    if(oldUrl.startsWith('/#')) {
                         /* RESERVED */
                     } else {
-                        var newUrl = '/#target=' + oldUrl;
+                        var newUrl = '/#' + oldUrl;
                         $(this).attr("href", newUrl);
                     }
                 });
             }
             function pwa_page() {
                 pwa_link();
                 var pwa_url = $(location).attr("href").split('#');
-                var pwa_var = pwa_url.length > 1 ? pwa_url[1] : '';
-                pwa_var.split('&').forEach(function (item, index) {
-                    if(item.startsWith('target=')) {
-                        var pwa_target = item.replace('target=', '');
+                var pwa_var = pwa_url.length > 1 ? pwa_url[1] : false;
+                    if (pwa_var != false) {
+                        var pwa_target = pwa_var;
                         Pace.restart();
                         $('.container-fluid').html('');
                         $.get(pwa_target, function (data) {
@@ -270,7 +269,6 @@ <h3 class="page-header">
                             Pace.stop();
                         });
                     }
-                });
             }
             // START : Code to handle install prompt on desktop
             let deferredPrompt;

diff --git a/sihipo_root/templates/empty.html b/sihipo_root/templates/empty.html
@@ -17,11 +17,11 @@ <h3 class="page-header">
                 {% if page_obj.has_previous %}
                     <a class="btn btn-outline btn-primary" href="{% url name|add:'_list' %}?page={{ page_obj.previous_page_number }}">&lt;</a>
                 {% endif %}
-                <a class="btn btn-outline btn-primary" href="javascript:var jump=parseInt(prompt('Loncat ke halaman?'));location.href='#target={% url name|add:'_list' %}?page='+((jump>{{ page_obj.paginator.num_pages }}?{{ page_obj.paginator.num_pages }}:jump)||1);location.reload();">
+                <a class="btn btn-outline btn-primary" href="javascript:var jump=parseInt(prompt('Loncat ke halaman?'));location.href='/#{% url name|add:'_list' %}?page='+((jump>{{ page_obj.paginator.num_pages }}?{{ page_obj.paginator.num_pages }}:jump)||1);location.reload();">
                     {{ page_obj.number }}/{{ page_obj.paginator.num_pages }}
                 </a>
                 {% if page_obj.has_next %}
-                    <a class="btn btn-outline btn-primary" href="#target={% url name|add:'_list' %}?page={{ page_obj.next_page_number }}">&gt;</a>
+                    <a class="btn btn-outline btn-primary" href="/#{% url name|add:'_list' %}?page={{ page_obj.next_page_number }}">&gt;</a>
                 {% endif %}
             </div>
         </div>
@@ -30,7 +30,7 @@ <h3 class="page-header">
 </div>
 <script type="text/javascript">
     if(document.head.innerHTML == '') {
-        location.href = window.location.protocol + '//' + window.location.hostname + ':' + window.location.port + '/#target=' + window.location.pathname;
+        location.href = window.location.protocol + '//' + window.location.hostname + ':' + window.location.port + '/#' + window.location.pathname;
     }
     {% block javascript %}{% endblock %}
     $(document).ready(function() {

diff --git a/sihipo_root/templates/form.html b/sihipo_root/templates/form.html
@@ -35,7 +35,7 @@
         $.get(target, function () {})
         .done(function () {
             {% if pwa_app_single %}
-                location.href = '#target=' + target;
+                location.href = '/#' + target;
             {% else %}
                 location.href = target;
             {% endif %}
@@ -45,7 +45,7 @@
             $.get(target, function () {})
             .done(function () {
                 {% if pwa_app_single %}
-                    location.href = '#target=' + target;
+                    location.href = '/#' + target;
                 {% else %}
                     location.href = target;
                 {% endif %}

diff --git a/sihipo_root/templates/list.html b/sihipo_root/templates/list.html
@@ -30,7 +30,7 @@
 			</thead>
 			<tbody>
 				{% for object in object_list %}
-					<tr oncontextmenu="location.href='{{ pwa_app_single|yesno:'#target=,' }}{% url name|add:'_update' object.id %}';return false;">
+					<tr oncontextmenu="location.href='{{ pwa_app_single|yesno:'/#,' }}{% url name|add:'_update' object.id %}';return false;">
 						{% block list_body %}
 						{% for table_field in table_fields %}
 						<td {% if object|dict_get_field_type:table_field in numeric_field %}data-type="numeric"{% endif %}>

diff --git a/sihipo_root/urls.py b/sihipo_root/urls.py
@@ -1,9 +1,6 @@
 from . import views
 from django.conf.urls import url, include
 from django.contrib.auth import views as auth_views
-from sihipo_root.threads import *
-import threading
-
 
 urlpatterns = [
     url(r'^$', views.HomeView.as_view(), name='home'),
@@ -114,28 +111,3 @@
     url(r'^plantalert/de/(?P<pk>\d+)$', views.PlantAlertDe, name='plantalert_de'),
 #     url(r'^plantduplicate/<str:model>/(?P<pk>\d+)$', views.PlantDuplicate, name='plantduplicate'),
 ]
-
-# thread_sensor_run = False
-# thread_control_run = False
-# thread_eval_run = False
-# thread_telegram_run = False
-# 
-# for t in threading.enumerate():
-#     if t.getName() == 'thread_sensor':
-#         thread_sensor_run = True
-#     if t.getName() == 'thread_control':
-#         thread_control_run = True
-#     if t.getName() == 'thread_eval':
-#         thread_eval_run = True
-#     if t.getName() == 'thread_telegram':
-#         thread_telegram_run = True
-# 
-# if not thread_control_run:
-#     tf_control = ControlThread()
-#     tf_control.start()
-# if not thread_eval_run:
-#     tf_eval = EvalThread()
-#     tf_eval.start()
-# if not thread_telegram_run:
-#     tf_sensor = SensorThread(interval=36000)
-#     tf_sensor.start()