Nmct 2017 01

readme.md

@@ -20,7 +20,7 @@ OnoSW is the software framework for [OPSORO](http://www.opsoro.be/), to be used
 5. Install Python development files, Avahi daemon, LuaJIT
 
     ```
-    sudo apt-get install python2.7-dev avahi-daemon libluajit-5.1-dev
+    sudo apt-get install python2.7-dev avahi-daemon libluajit-5.1-dev git
     ```
 
 6. Install PIP
@@ -41,7 +41,7 @@ OnoSW is the software framework for [OPSORO](http://www.opsoro.be/), to be used
 8. Install Python packages (flask, flask-login, pyyaml, pluginbase, sockjs-tornado, simplejson, lupa, numpy, scipy, spidev)
 
     ```
-    sudo pip install flask flask-login pyyaml pluginbase sockjs-tornado simplejson lupa numpy spidev
+    sudo pip install flask flask-login pyyaml pluginbase sockjs-tornado simplejson lupa numpy spidev gitpython flask-babel noise pyserial enum enum34 requests tweepy
     sudo apt-get install -y python-smbus i2c-tools
     sudo apt-get install -y python-scipy
     ```

run

@@ -3,70 +3,9 @@
 import os
 import sys
 
-import os.path
-import shutil
-import stat
-import subprocess
-
-from git import Git, Repo
-
 basedir = os.path.dirname(os.path.realpath(__file__))
-
 # insert opsoro src system path to enable calling opsoro classes
 sys.path.insert(0, os.path.join(basedir, "src"))
 
-# ----------------------------------------------------------------------
-# UPDATER
-# ----------------------------------------------------------------------
-git_dir = os.path.abspath(basedir) + '/'
-backup_dir = '/home/pi/OPSORO/backup/'
-
-# Check if update is needed
-if os.path.isfile(os.path.join(basedir, 'update.var')):
-    print('Updating...')
-    if os.path.exists(backup_dir):
-        # remove previous backup
-        try:
-            shutil.rmtree(backup_dir)
-        except Exception as e:
-            print('Remove backup failed: ', str(e))
-            pass
-
-    try:
-        shutil.copytree(basedir, backup_dir)
-    except Exception as e:
-        print('Backup copy failed: ', str(e))
-        pass
-
-    # Link git & update
-    try:
-        g = Git(git_dir)
-        g.fetch('--all')
-        g.reset('--hard', 'origin/' + g.branch().split()[-1])
-        # g.pull()
-    except Exception as e:
-        print('Git failed to update: ', str(e))
-        pass
-
-    # Set script executable for deamon
-    try:
-        st = os.stat(os.path.join(basedir, 'run'))
-        os.chmod(
-            os.path.join(basedir, 'run'), st.st_mode | stat.S_IXUSR |
-            stat.S_IXGRP | stat.S_IXOTH)
-    except Exception as e:
-        print('Exec state set failed: ', str(e))
-        pass
-
-    # Clear update var file
-    os.remove(os.path.join(basedir, 'update.var'))
-
-    # restart service
-    command = ['/usr/sbin/service', 'opsoro', 'restart']
-    #shell=FALSE for sudo to work.
-    subprocess.call(command, shell=False)
-
-# ----------------------------------------------------------------------
-
 import opsoro
 opsoro.main()

src/opsoro/__init__.py

@@ -1,54 +1,53 @@
 #!/usr/bin/env python
 
-import signal
-import sys
+import datetime
 import logging
 import logging.handlers
-import random
 import os
-import tornado.log
-import datetime
+import signal
+import sys
 
-# from opsoro.server import Server
+import tornado.log
 
 from opsoro.console_msg import *
 from opsoro.server import Server
 
 
 # Handle SIGTERM for graceful shutdown of daemon
 def sigterm_handler(_signo, _stack_frame):
-    print "SIGTERM received... Goodbye!"
-    sys.exit(0)
+  print "SIGTERM received... Goodbye!"
+  sys.exit(0)
 
 
 try:
-    LOG_FILE_DIR = '../../../log/'
-    if not os.path.exists(LOG_FILE_DIR):
-        os.makedirs(LOG_FILE_DIR)
-
-    # Setup logging
-    LOG_FILENAME = LOG_FILE_DIR + str(datetime.date.today()) + ".log"
-    LOG_LEVEL = logging.DEBUG
-
-    tornado.log.enable_pretty_logging()
-    logger = logging.getLogger()
-    logger.setLevel(LOG_LEVEL)
-    handler = logging.handlers.TimedRotatingFileHandler(
-        LOG_FILENAME, when="midnight", backupCount=3)
-    formatter = logging.Formatter("%(asctime)s %(levelname)-8s %(message)s")
-    handler.setFormatter(formatter)
-    logger.addHandler(handler)
+  LOG_FILE_DIR = '../../../log/'
+  if not os.path.exists(LOG_FILE_DIR):
+    os.makedirs(LOG_FILE_DIR)
+
+  # Setup logging
+  LOG_FILENAME = LOG_FILE_DIR + str(datetime.date.today()) + ".log"
+  LOG_LEVEL = logging.DEBUG
+
+  tornado.log.enable_pretty_logging()
+  logger = logging.getLogger()
+  logger.setLevel(LOG_LEVEL)
+  handler = logging.handlers.TimedRotatingFileHandler(
+      LOG_FILENAME, when="midnight", backupCount=3)
+  formatter = logging.Formatter("%(asctime)s %(levelname)-8s %(message)s")
+  handler.setFormatter(formatter)
+  logger.addHandler(handler)
 
 except Exception as e:
-    print_error('Unable to log')
+  print_error('Unable to log')
 
 
 def main():
-    signal.signal(signal.SIGTERM, sigterm_handler)
-    print_info("OPSORO OS started...")
-    app = Server()
-    app.run()
+  signal.signal(signal.SIGTERM, sigterm_handler)
+  print_info("OPSORO OS started...")
+  app = Server()
+  app.run()
+
 
 # Initialization
 if __name__ == "__main__":
-    main()
+  main()