Procházet zdrojové kódy

Reordered code to handle initial setup appropriately.

Adam Day před 2 roky
rodič
revize
c5ba9e2a74
2 změnil soubory, kde provedl 40 přidání a 35 odebrání
  1. 3 0
      .gitignore
  2. 37 35
      app.py

+ 3 - 0
.gitignore

@@ -1,5 +1,8 @@
 /site.db
 .idea
+/build/
+/dist/
+/*.spec
 /app.spec
 /build/
 /dist/

+ 37 - 35
app.py

@@ -66,6 +66,43 @@ class PasswordResetLog(Model):
         database = db
 
 
+# Encrypt the password with SHA256
+def encrypt_password(password):
+    hash = hashlib.sha256(password.encode('utf-8')).hexdigest()
+    return hash
+
+
+# Check for DB tables and create if they don't exist
+if db.table_exists('user') is False:
+    db.create_tables([User, ])
+    User.create(username='admin', password=encrypt_password('admin'),
+                date_created=datetime.datetime.now(), logged_in=False).save()
+
+if db.table_exists('ilsuser') is False:
+    db.create_tables([IlsUser, ])
+
+if db.table_exists('settings') is False:
+    db.create_tables([Settings, ])
+    Settings.create(name='Debug Mode', value=False).save()
+    Settings.create(name='HTTP Port', value=5055).save()
+    Settings.create(name='SMTP Host', value="").save()
+    Settings.create(name='SMTP Port', value="587").save()
+    Settings.create(name='SMTP Username', value="").save()
+    Settings.create(name='SMTP Password', value="").save()
+    Settings.create(name='Domain Name', value="lynx").save()
+    Settings.create(name='Password Reset URL', value="https://terminal.idaho-lynx.org").save()
+
+if db.table_exists('log') is False:
+    db.create_tables([Log, ])
+
+if db.table_exists('password_reset_log') is False:
+    db.create_tables([PasswordResetLog, ])
+
+if db.table_exists('schedule') is False:
+    db.create_tables([Schedule, ])
+
+db.close()
+
 settings = Settings.select().execute()
 
 debug_setting = Settings.get(Settings.name == 'Debug Mode')
@@ -114,12 +151,6 @@ def send_email(to, subject, body):
     emailer.send_email(to, subject, body)
 
 
-# Encrypt the password with SHA256
-def encrypt_password(password):
-    hash = hashlib.sha256(password.encode('utf-8')).hexdigest()
-    return hash
-
-
 def shutdown_session(exception=None):
     print('Stopping HTTP Service...')
     http_server.stop()
@@ -160,35 +191,6 @@ def requires_auth():
         return False
 
 
-# Check for DB tables and create if they don't exist
-if db.table_exists('user') is False:
-    db.create_tables([User, IlsUser])
-    User.create(username='admin', password=encrypt_password('admin'),
-                date_created=datetime.datetime.now(), logged_in=False).save()
-
-if db.table_exists('ilsuser') is False:
-    db.create_tables([IlsUser])
-
-if db.table_exists('settings') is False:
-    db.create_tables([Settings])
-    Settings.create(name='Debug Mode', value=False).save()
-    Settings.create(name='HTTP Port', value=5055).save()
-    Settings.create(name='SMTP Host', value="").save()
-    Settings.create(name='SMTP Port', value="587").save()
-    Settings.create(name='SMTP Username', value="").save()
-    Settings.create(name='SMTP Password', value="").save()
-    Settings.create(name='Domain Name', value="lynx").save()
-    Settings.create(name='Password Reset URL', value="https://terminal.idaho-lynx.org").save()
-
-if db.table_exists('log') is False:
-    db.create_tables([Log])
-
-if db.table_exists('password_reset_log') is False:
-    db.create_tables([PasswordResetLog])
-
-if db.table_exists('schedule') is False:
-    db.create_tables([Schedule])
-
 db.close()
 
 app = Flask(__name__)