Release 1.2: bulk upload, S3/SFTP/FTP, SMTP, password reset, user groups, git deploy

Co-authored-by: Cursor <cursoragent@cursor.com>

app/folders.py

@@ -22,6 +22,8 @@ from app.folder_utils import (
     unlock_folder,
 )
 from app.models import Folder, FolderInvite, FolderMember, Photo, User
+from app.settings_service import get_settings
+from app.storage_service import delete_photo_file
 
 bp = Blueprint("folders", __name__)
 
@@ -84,6 +86,7 @@ def view_folder(folder_id):
         photos=photos,
         can_edit=can_edit,
         share_url=_share_url(folder),
+        max_bulk_upload=get_settings().max_bulk_upload,
     )
 
 
@@ -274,6 +277,7 @@ def _render_share_folder(folder):
         photos=photos,
         can_edit=can_edit_folder(folder),
         share_url=_share_url(folder),
+        max_bulk_upload=get_settings().max_bulk_upload,
     )
 
 
@@ -290,14 +294,8 @@ def is_folder_owner_or_member(folder):
 
 
 def _delete_folder(folder):
-    upload_dir = None
     for photo in folder.photos.all():
-        if upload_dir is None:
-            from flask import current_app
-            upload_dir = current_app.config["UPLOAD_FOLDER"]
-        filepath = os.path.join(upload_dir, photo.filename)
-        if os.path.exists(filepath):
-            os.remove(filepath)
+        delete_photo_file(photo.filename, photo.storage_backend)
         db.session.delete(photo)
     db.session.delete(folder)
     db.session.commit()