simo 2.1.2__py3-none-any.whl → 2.1.4__py3-none-any.whl

simo/core/tasks.py

@@ -9,6 +9,7 @@ import threading
 import pkg_resources
 import sys
 import traceback
+import uuid
 from django.db.models import Q
 from django.db import connection, transaction
 from django.template.loader import render_to_string
@@ -102,9 +103,15 @@ def save_config(data):
 def sync_with_remote():
     from simo.users.models import User
 
+    try:
+        mac = str(hex(uuid.getnode()))
+    except:
+        mac = ''
+
     report_data = {
         'simo_version': pkg_resources.get_distribution('simo').version,
         'local_http': 'https://%s' % get_self_ip(),
+        'mac': mac,
         'hub_uid': dynamic_settings['core__hub_uid'],
         'hub_secret': dynamic_settings['core__hub_secret'],
         'remote_conn_version': dynamic_settings['core__remote_conn_version'],
@@ -321,7 +328,7 @@ def vacuum_full():
 
 @celery_app.task
 def update():
-    from simo.auto_update import perform_update
+    from simo.management.auto_update import perform_update
     perform_update()
 
 
@@ -397,7 +404,7 @@ def setup_periodic_tasks(sender, **kwargs):
     sender.add_periodic_task(1, watch_timers.s())
     sender.add_periodic_task(20, sync_with_remote.s())
     sender.add_periodic_task(60 * 60, clear_history.s())
-    sender.add_periodic_task(60 * 60 * 6, update_latest_version_available.s())
+    sender.add_periodic_task(60 * 60, update_latest_version_available.s())
     sender.add_periodic_task(60, drop_fingerprints_learn.s())
     sender.add_periodic_task(60 * 60 * 24, restart_postgresql.s())
     sender.add_periodic_task(60 * 60, low_battery_notifications.s())

simo/management/install.py

@@ -86,6 +86,7 @@ def copy_template(to_directory='/etc/SIMO'):
 def install():
     simo_directory = '/etc/SIMO'
     installed_flag_file_path = os.path.join(simo_directory, 'is_installed.json')
+    HUB_DIR = os.path.join(simo_directory, 'hub')
 
     if os.path.exists(installed_flag_file_path):
         print("SIMO.io hub is already installed. ")
@@ -115,21 +116,50 @@ def install():
     step += 1
     print(f"{step}.___________Copy default template__________________")
 
-    if os.path.exists(simo_directory):
-        print("Already exists!")
-    else:
-        try:
-            copy_template(simo_directory)
-        except Exception as e:
-            print(traceback.format_exc(), file=sys.stderr)
-            shutil.rmtree(simo_directory, ignore_errors=True)
-            return
+    shutil.rmtree(simo_directory, ignore_errors=True)
+    try:
+        copy_template(simo_directory)
+    except Exception as e:
+        print(traceback.format_exc(), file=sys.stderr)
+        shutil.rmtree(simo_directory, ignore_errors=True)
+        return
+
+    step += 1
+    print(f"{step}.___________Create database__________________")
+    subprocess.call(
+        'sudo -u postgres createuser -s -i -d -r -l -w root',
+        shell=True
+    )
+    subprocess.call('createdb SIMO', shell=True)
+
+    step += 1
+    print(f"{step}.___________Apply migrations__________________")
+
+    proc = subprocess.Popen(
+        [os.path.join(HUB_DIR, 'manage.py'), 'migrate'],
+        cwd=HUB_DIR,
+        stderr=subprocess.PIPE
+    )
+    out, err = proc.communicate()
+    if proc.returncode:
+        raise Exception(err.decode())
+
+    step += 1
+    print(f"{step}.___________Collect statics__________________")
+    proc = subprocess.Popen(
+        [os.path.join(HUB_DIR, 'manage.py'), 'collectstatic',
+         '--noinput'],
+        cwd=HUB_DIR, stderr=subprocess.PIPE
+    )
+    out, err = proc.communicate()
+    if proc.returncode:
+        raise Exception(err.decode())
 
     step += 1
     print(f"{step}.___________Configure supervisor__________________")
 
     try:
-        os.remove('/etc/supervisor/conf.d/SIMO.conf', ignore_errors=True)
+        os.remove('/etc/supervisor/conf.d/SIMO.conf')
     except:
         pass
     os.symlink(
@@ -141,7 +171,6 @@ def install():
         sys.exit("INSTALLATION FAILED! Unable to start supervisord")
 
 
-
     step += 1
     print("%d._____________ Configure NGINX _________________________" % step)
 

simo/management/on_http_start.py

@@ -68,6 +68,11 @@ def update_auto_update():
     executable_path = '/usr/local/bin/simo-auto-update'
     if os.geteuid() == 0:
         # We are running as root!
+        if os.path.exists(executable_path):
+            # refresh the link if it already exists
+            os.remove(executable_path)
+            os.symlink(auto_update_file_path, executable_path)
+
         if not os.path.islink(executable_path):
             # There is no symbolic link yet made for auto updates.
             # Let's make it!

{simo-2.1.2.dist-info → simo-2.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simo
-Version: 2.1.2
+Version: 2.1.4
 Summary: Smart Home on Steroids!
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io

{simo-2.1.2.dist-info → simo-2.1.4.dist-info}/RECORD

@@ -40,7 +40,7 @@ simo/core/serializers.py,sha256=M3r2P1-Eb5eObOqcI9dttedh4UxgPwWwGYmOfXe3BDk,2030
 simo/core/signal_receivers.py,sha256=ZhHg1mLn_Yhin-23Af1WNPfE5hnGYhhVDZDTEjRtO-A,6190
 simo/core/socket_consumers.py,sha256=n7VE2Fvqt4iEAYLTRbTPOcI-7tszMAADu7gimBxB-Fg,9635
 simo/core/storage.py,sha256=YlxmdRs-zhShWtFKgpJ0qp2NDBuIkJGYC1OJzqkbttQ,572
-simo/core/tasks.py,sha256=6Fyn6_eMiH9CEj-Nb4BkrQNmWeiIQr2ski7Rkoe3pvg,13888
+simo/core/tasks.py,sha256=VTr83_8avke6UwFZ9VQ8c2qROpVOqAWqc0RbMxNPd08,14005
 simo/core/todos.py,sha256=eYVXfLGiapkxKK57XuviSNe3WsUYyIWZ0hgQJk7ThKo,665
 simo/core/types.py,sha256=WJEq48mIbFi_5Alt4wxWMGXxNxUTXqfQU5koH7wqHHI,1108
 simo/core/views.py,sha256=ze8yX0PBLN-DH8B8jol6NKj0hLOAE4WA1rTXf07G-MU,2129
@@ -73,7 +73,7 @@ simo/core/__pycache__/serializers.cpython-38.pyc,sha256=ibatzlaahJ0keKpml7JWuPsr
 simo/core/__pycache__/signal_receivers.cpython-38.pyc,sha256=gKwUVUf1vtIo1Ecvm6xGmBSwpEUALHrXai5pkMmjr9I,4895
 simo/core/__pycache__/socket_consumers.cpython-38.pyc,sha256=NJUr7nRyHFvmAumxxWpsod5wzVVZM99rCEuJs1utHA4,8432
 simo/core/__pycache__/storage.cpython-38.pyc,sha256=BTkYH8QQyjqI0WOtJC8fHNtgu0YA1vjqZclXjC2vCVI,1116
-simo/core/__pycache__/tasks.cpython-38.pyc,sha256=VHLvLqJF23l083sXptO7xaPrJbs2J6R7uhM79Sz2L9s,9796
+simo/core/__pycache__/tasks.cpython-38.pyc,sha256=maImi7pqoVNvKNESi4xY_WdTOJdjDgP11knfXKKuVcI,9902
 simo/core/__pycache__/todos.cpython-38.pyc,sha256=lOqGZ58siHM3isoJV4r7sg8igrfE9fFd-jSfeBa0AQI,253
 simo/core/__pycache__/views.cpython-38.pyc,sha256=ULyoiWRiU_auXTuxzi2RyqYIea9VfaiMuTzkMAWaWOA,2343
 simo/core/__pycache__/widgets.cpython-38.pyc,sha256=sR0ZeHCHrhnNDBJuRrxp3zUsfBp0xrtF0xrK2TkQv1o,3520
@@ -10337,10 +10337,10 @@ simo/generic/templates/generic/controllers_info/stateselect.md,sha256=T0w3vJg02W
 simo/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/management/auto_update.py,sha256=4MDrJHdtC5LxEJM258Y0kc5yI4yloeKhDjh-S2BN-ZQ,2115
 simo/management/copy_template.py,sha256=Iehq57FYMzdHNp3LU4ue6rr6AkRiGeOthG7PoGWd88Q,2002
-simo/management/install.py,sha256=n6lSMYuXXrkpBlikTqVgH9pH7sv-WHlcqsZxS2FY1O4,8761
-simo/management/on_http_start.py,sha256=YUG4sspyUMRbMyyF3oYJrK6A-vOC1xxkeq10RhZwczE,3113
+simo/management/install.py,sha256=IwSeullwXxATsL4cpLNmOgmVJASwLehopohp9Ua-064,9640
+simo/management/on_http_start.py,sha256=ZDotfMQaCjksD5FFf3eZYgJS-gd_-7eZhYTHLaD-448,3312
 simo/management/__pycache__/__init__.cpython-38.pyc,sha256=ey9k5mPsmvAHRVf5Du6QUqy40LgBCAPN_B5EaR6h9Eg,164
-simo/management/__pycache__/on_http_start.cpython-38.pyc,sha256=I3IXOxj87WQC6MsLLEOmM4E_Z1sr5oXE77HyZquar2M,2811
+simo/management/__pycache__/on_http_start.cpython-38.pyc,sha256=ERfcMNz3QnqDJTJ4PwbmDfLgPCh5hrEcaedejARFkUQ,2864
 simo/management/_hub_template/hub/asgi.py,sha256=ElN_fdeSkf0Ysa7pS9rJVmZ1HmLhFxb8jFaMLqe1220,126
 simo/management/_hub_template/hub/celeryc.py,sha256=3ksDXftIZKJ4Cq9WNKJERdZdQlDEnjTQXycweRFmsSQ,27
 simo/management/_hub_template/hub/manage.py,sha256=PNNlw3EVeIJDgkG0l-klqoxsKWfTYWG9jzRG0upmAaI,620
@@ -10494,9 +10494,9 @@ simo/users/templates/invitations/expired_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCe
 simo/users/templates/invitations/expired_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo-2.1.2.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.1.2.dist-info/METADATA,sha256=-XN-d9NSYev-sEOutv6tpl24fZqUGR3N4KACepMnEOM,1817
-simo-2.1.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-simo-2.1.2.dist-info/entry_points.txt,sha256=3njaDZyp2UwCRhVkWOHrDt1TsSCfZVmfVVGsMsaUhyk,60
-simo-2.1.2.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.1.2.dist-info/RECORD,,
+simo-2.1.4.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.1.4.dist-info/METADATA,sha256=BV3GcDw-Fy6Wx4aVwZIwJ6vS_Qwea0cVZbGor3xjYiE,1817
+simo-2.1.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+simo-2.1.4.dist-info/entry_points.txt,sha256=SJBxiDpH7noO0STxVI_eRIsGR-nLgdXXeqCDe8cXlbM,65
+simo-2.1.4.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.1.4.dist-info/RECORD,,

simo-2.1.4.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+simo-install = simo.management.install:install

simo-2.1.2.dist-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-simo-install = management.install:install