From 5763aae287cbceee318f975495f7d9429517c88f Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Thu, 11 Feb 2021 20:35:30 +0000
Subject: [PATCH] .

---
 rad/settings.py                              |  7 ++++++-
 rapids/migrations/0014_auto_20210211_2034.py | 20 ++++++++++++++++++++
 rapids/migrations/0015_auto_20210211_2035.py | 20 ++++++++++++++++++++
 rapids/models.py                             |  4 ++--
 requirements.txt                             |  3 ++-
 5 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 rapids/migrations/0014_auto_20210211_2034.py
 create mode 100644 rapids/migrations/0015_auto_20210211_2035.py

diff --git a/rad/settings.py b/rad/settings.py
index 1371a688..ee2eab7b 100644
--- a/rad/settings.py
+++ b/rad/settings.py
@@ -50,6 +50,7 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'debug_toolbar',
     "tagulous",
+    "dbbackup",
 ]
 
 MIDDLEWARE = [
@@ -198,7 +199,11 @@ THUMBNAIL_ALIASES = {
     },
 }
 
+DBBACKUP_STORAGE = 'django.core.files.storage.FileSystemStorage'
+DBBACKUP_STORAGE_OPTIONS = {'location': os.path.join(BASE_DIR, '../backups')}
+
 try:
     from .settings_local import *
 except ImportError:
-    pass
\ No newline at end of file
+    pass
+
diff --git a/rapids/migrations/0014_auto_20210211_2034.py b/rapids/migrations/0014_auto_20210211_2034.py
new file mode 100644
index 00000000..d6fc2db2
--- /dev/null
+++ b/rapids/migrations/0014_auto_20210211_2034.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.1.3 on 2021-02-11 20:34
+
+import django.core.files.storage
+from django.db import migrations, models
+import rapids.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rapids', '0013_auto_20210209_2239'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='rapidimage',
+            name='image',
+            field=models.FileField(storage=django.core.files.storage.FileSystemStorage(base_url='/media/rapids/', location='/home/ross/rad/media//rapids/'), upload_to=rapids.models.image_directory_path),
+        ),
+    ]
diff --git a/rapids/migrations/0015_auto_20210211_2035.py b/rapids/migrations/0015_auto_20210211_2035.py
new file mode 100644
index 00000000..2743692c
--- /dev/null
+++ b/rapids/migrations/0015_auto_20210211_2035.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.1.3 on 2021-02-11 20:35
+
+import django.core.files.storage
+from django.db import migrations, models
+import rapids.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rapids', '0014_auto_20210211_2034'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='rapidimage',
+            name='image',
+            field=models.FileField(storage=django.core.files.storage.FileSystemStorage(base_url='/media/rapids/', location='/home/ross/rad/media/rapids/'), upload_to=rapids.models.image_directory_path),
+        ),
+    ]
diff --git a/rapids/models.py b/rapids/models.py
index 68384d2b..75754638 100644
--- a/rapids/models.py
+++ b/rapids/models.py
@@ -24,7 +24,7 @@ from generic.models import Site, Condition, Sign, ExamBase
 
 image_storage = FileSystemStorage(
     # Physical file location ROOT
-    location=u"{0}/rapids/".format(settings.MEDIA_ROOT),
+    location=u"{0}rapids/".format(settings.MEDIA_ROOT),
     # Url for file
     base_url=u"{0}rapids/".format(settings.MEDIA_URL),
 )
@@ -288,7 +288,7 @@ class RapidImage(models.Model):
     rapid = models.ForeignKey(Rapid,
                               related_name="images",
                               on_delete=models.CASCADE)
-    image = models.ImageField(upload_to=image_directory_path, storage=image_storage)
+    image = models.FileField(upload_to=image_directory_path, storage=image_storage)
 
     feedback_image = models.BooleanField(default=False)
 
diff --git a/requirements.txt b/requirements.txt
index 733a804c..416b8e8e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,4 +13,5 @@ django-filer
 psycopg2-binary
 django-sortedm2m
 pytesseract
-opencv-python
\ No newline at end of file
+opencv-python
+django-dbbackup
\ No newline at end of file