From e6bc751844fc8055c490fd7d05a18dce0a84c354 Mon Sep 17 00:00:00 2001
From: Damien De Paoli <ddp@depaoli.id.au>
Date: Tue, 9 Feb 2021 19:37:30 +1100
Subject: [PATCH] added storage_path to settings

---
 settings.py             | 11 ++++++-----
 tables.sql              |  2 +-
 templates/settings.html |  4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/settings.py b/settings.py
index 9bc94c3..9c42077 100644
--- a/settings.py
+++ b/settings.py
@@ -12,9 +12,10 @@ from status import st, Status
 class Settings(db.Model):
     id = db.Column(db.Integer, db.Sequence('settings_id_seq'), primary_key=True )
     import_path = db.Column(db.String)
+    storage_path = db.Column(db.String)
 
     def __repr__(self):
-        return "<id: {}, import_path: {}>".format(self.id, self.import_path)
+        return f"<id: {id}, import_path: {import_path}, storage_path: {storage_path}>"
 
 ################################################################################
 # Helper class that inherits a .dump() method to turn class Settings into json / useful in jinja2
@@ -32,7 +33,8 @@ settings_schema = SettingsSchema(many=True)
 ################################################################################
 class SettingsForm(FlaskForm):
     id = HiddenField()
-    import_path = StringField('Path to import from:', [validators.DataRequired()])
+    import_path = StringField('Path(s) to import from:', [validators.DataRequired()])
+    storage_path = StringField('Path to store sorted images to:', [validators.DataRequired()])
     submit = SubmitField('Save' )
 
 ################################################################################
@@ -52,6 +54,7 @@ def settings():
             if 'submit' in request.form:
                 st.SetMessage("Successfully Updated Settings" )
                 s.import_path = request.form['import_path']
+                s.storage_path = request.form['storage_path']
             db.session.commit()
             return redirect( '/settings' )
         except SQLAlchemyError as e:
@@ -59,7 +62,5 @@ def settings():
             st.SetMessage( "<b>Failed to modify Setting:</b>&nbsp;{}".format(e.orig) )
             return render_template("settings.html", form=form, page_title=page_title)
     else:
-        tmp_sets = Settings.query.all() 
-        sets = settings_schema.dump( tmp_sets )
-        form = SettingsForm(obj=tmp_sets[0])
+        form = SettingsForm( obj=Settings.query.first() )
         return render_template("settings.html", form=form, page_title = page_title)
diff --git a/tables.sql b/tables.sql
index 7164944..771a130 100644
--- a/tables.sql
+++ b/tables.sql
@@ -1,6 +1,6 @@
 alter database PA set timezone to 'Australia/Victoria'; 
 
-create table SETTINGS( ID integer, IMPORT_PATH varchar, constraint PK_SETTINGS_ID primary key(ID) );
+create table SETTINGS( ID integer, IMPORT_PATH varchar, STORAGE_PATH varchar, constraint PK_SETTINGS_ID primary key(ID) );
 
 create table FILE_TYPE ( ID integer, NAME varchar(32) unique, constraint PK_FILE_TYPE_ID primary key(ID) );
 
diff --git a/templates/settings.html b/templates/settings.html
index 70dd336..e3c72c5 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -8,8 +8,8 @@
 						{{field}}<br>
 					{% elif field.type != 'SubmitField' %}
 						<div class="form-row col-lg-12">
-						{{ field.label( class="col-lg-2" ) }}
-						{{ field( class="form-control col-lg-10" ) }}
+						{{ field.label( class="col-lg-3 justify-content-end" ) }}
+						{{ field( class="form-control col-lg-9" ) }}
 						</div class="form-row col-lg-12">
 					{% endif %}
 				{% endfor %}