From f4099c69292d3bff272cc1c8c3275b368ae1801b Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@klebos.com>
Date: Tue, 26 May 2020 02:21:03 +0100
Subject: [PATCH] fix py3 bug and make settings import clearer

---
 databaseReset.py | 16 ++++++++++++----
 settings.py      |  3 +--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/databaseReset.py b/databaseReset.py
index 09b3214..81a3ad5 100644
--- a/databaseReset.py
+++ b/databaseReset.py
@@ -100,7 +100,7 @@ def import_surveyimgs():
     for future re-working to manage progress against notes, plans and elevs.
     """
     #import troggle.parsers.surveys
-    #print("Importing survey images")
+    print("NOT Importing survey images")
     #troggle.parsers.surveys.parseSurveys(logfile=settings.LOGFILE)
 
 def import_surveyscans():
@@ -258,7 +258,7 @@ class JobQueue():
 
 
             print("--  ", settings.DATABASES['default']['NAME'], settings.DATABASES['default']['ENGINE'])
-            print("--  DATABASES.default", settings.DATABASES['default'])
+            #print("--  DATABASES.default", settings.DATABASES['default'])
 
             # but because the user may be expecting to add this to a db with lots of tables already there,
             # the jobqueue may not start from scratch so we need to initialise the db properly first
@@ -334,7 +334,11 @@ class JobQueue():
                             print("    this", end=' ')
                         else:
                             # prints one place to the left of where you expect
-                            days = (r[i]-r[len(r)-1])/(24*60*60)
+                            if r[len(r)-1]:
+                                s = r[i]-r[len(r)-1]
+                            else:
+                                s = 0
+                            days = (s)/(24*60*60)
                             print('%8.2f' % days, end=' ')
                 elif r[i]: 
                     print('%8.1f' % r[i], end=' ')
@@ -388,6 +392,10 @@ if __name__ == "__main__":
     import django
     django.setup()
 
+    if os.geteuid() == 0:
+        print("Do not run as root or using sudo - file permissions for cache files and logs will break")
+        print("Aborting run.")
+        exit()
     if len(sys.argv)>2:
         runlabel = sys.argv[len(sys.argv)-1]
     else: 
@@ -452,7 +460,7 @@ if __name__ == "__main__":
         exit()
     else:
         usage()
-        print(("%s not recognised as a command." % sys.argv[1]))
+        print("%s not recognised as a command." % sys.argv[1])
         exit()
 
     jq.run()
diff --git a/settings.py b/settings.py
index 58b930d..48e1d20 100644
--- a/settings.py
+++ b/settings.py
@@ -4,6 +4,7 @@ import urllib.parse
 
 import django
 
+print("** importing settings.py")
 from localsettings import *
  #inital localsettings call so that urljoins work
 
@@ -14,8 +15,6 @@ from localsettings import *
 #Local application/library specific imports.
 #You should put a blank line between each group of imports.
 
-print("** importing settings.py")
-print("--**-- REPOS_ROOT_PATH: ", REPOS_ROOT_PATH)
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))