Improve image handling

greybook/models.py

@@ -84,15 +84,18 @@ def reviewed_comments_count(self):
 
     def delete(self):
         upload_path = current_app.config['GREYBOOK_UPLOAD_PATH']
-        upload_url = url_for('blog.get_image', filename='')
-        images = re.findall(rf'<img.*?src="{upload_url}(.*?)"', self.body)
+        images = self.extract_images()
         for image in images:
             file_path = upload_path / image
             if file_path.exists():
                 file_path.unlink()
         db.session.delete(self)
         db.session.commit()
 
+    def extract_images(self):
+        upload_url = url_for('blog.get_image', filename='')
+        return re.findall(rf'<img.*?src="{upload_url}(.*?)"', self.body)
+
 
 class Comment(db.Model):
     __tablename__ = 'comment'

greybook/settings.py

@@ -33,7 +33,7 @@ class BaseConfig:
     GREYBOOK_SLOW_QUERY_THRESHOLD = 1
 
     GREYBOOK_UPLOAD_PATH = os.getenv('GREYBOOK_UPLOAD_PATH', BASE_DIR / 'uploads')
-    GREYBOOK_ALLOWED_IMAGE_EXTENSIONS = ['png', 'jpg', 'jpeg', 'gif']
+    GREYBOOK_ALLOWED_IMAGE_EXTENSIONS = ['.png', '.jpg', '.jpeg', '.gif']
     GREYBOOK_LOGGING_PATH = os.getenv('GREYBOOK_LOGGING_PATH', BASE_DIR / 'logs/greybook.log')
     GREYBOOK_ERROR_EMAIL_SUBJECT = '[Greybook] Application Error'
 

greybook/static/js/main.js

@@ -1,32 +1,32 @@
-dayjs.extend(window.dayjs_plugin_relativeTime)
-dayjs.extend(window.dayjs_plugin_utc)
-dayjs.extend(window.dayjs_plugin_localizedFormat)
+dayjs.extend(window.dayjs_plugin_relativeTime);
+dayjs.extend(window.dayjs_plugin_utc);
+dayjs.extend(window.dayjs_plugin_localizedFormat);
 
-const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]')
-const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl))
+const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]');
+const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl));
 
 function renderAllDatetime() {
   // render normal time
-  const elements = document.querySelectorAll('.dayjs')
+  const elements = document.querySelectorAll('.dayjs');
   elements.forEach(elem => {
-    const date = dayjs.utc(elem.innerHTML)
-    const format = elem.dataset.format ?? 'LL'
-    elem.innerHTML = date.local().format(format)
-  })
+    const date = dayjs.utc(elem.innerHTML);
+    const format = elem.dataset.format ?? 'LL';
+    elem.innerHTML = date.local().format(format);
+  });
   // render from now time
-  const fromNowElements = document.querySelectorAll('.dayjs-from-now')
+  const fromNowElements = document.querySelectorAll('.dayjs-from-now');
   fromNowElements.forEach(elem => {
-    const date = dayjs.utc(elem.innerHTML)
-    elem.innerHTML = date.local().fromNow()
-  })
+    const date = dayjs.utc(elem.innerHTML);
+    elem.innerHTML = date.local().fromNow();
+  });
   // render tooltip time
-  const toolTipElements = document.querySelectorAll('.dayjs-tooltip')
+  const toolTipElements = document.querySelectorAll('.dayjs-tooltip');
   toolTipElements.forEach(elem => {
-    const date = dayjs.utc(elem.dataset.timestamp)
-    const format = elem.dataset.format ?? 'LLL'
-    elem.dataset.bsTitle = date.local().format(format)
-    const tooltip = new bootstrap.Tooltip(elem)
-  })
+    const date = dayjs.utc(elem.dataset.timestamp);
+    const format = elem.dataset.format ?? 'LLL';
+    elem.dataset.bsTitle = date.local().format(format);
+    const tooltip = new bootstrap.Tooltip(elem);
+  });
 }
 
-document.addEventListener('DOMContentLoaded', renderAllDatetime)
+document.addEventListener('DOMContentLoaded', renderAllDatetime);

greybook/utils.py

@@ -21,10 +21,7 @@ def redirect_back(default='blog.index', **kwargs):
 
 
 def allowed_file(filename):
-    return (
-        '.' in filename
-        and filename.rsplit('.', 1)[1].lower() in current_app.config['GREYBOOK_ALLOWED_IMAGE_EXTENSIONS']
-    )
+    return '.' in filename and Path(filename).suffix.lower() in current_app.config['GREYBOOK_ALLOWED_IMAGE_EXTENSIONS']
 
 
 def random_filename(old_filename):

tests/test_admin.py

@@ -1,4 +1,3 @@
-import pathlib
 from unittest.mock import patch
 
 from greybook.core.extensions import db
@@ -76,9 +75,14 @@ def test_delete_post_with_images(self, mock_exists, mock_unlink):
         post.body = '<img src="/uploads/test.png"> <img alt="" src="/uploads/test2.png">'
         db.session.commit()
 
+        expected_images = ['test.png', 'test2.png']
+        with patch('greybook.models.url_for', return_value='/uploads/'):
+            extracted_images = post.extract_images()
+        self.assertEqual(extracted_images, expected_images)
+
         self.client.post('/admin/post/1/delete')
-        self.assertEqual(pathlib.Path.unlink.call_count, 2)
-        self.assertEqual(pathlib.Path.exists.call_count, 2)
+        self.assertEqual(mock_exists.call_count, 2)
+        self.assertEqual(mock_unlink.call_count, 2)
 
     def test_delete_comment(self):
         response = self.client.get('/admin/comment/1/delete', follow_redirects=True)