docker upload directories fixes

Dockerfile

@@ -22,7 +22,7 @@ RUN pip install --no-cache-dir -r requirements.txt
 COPY . .
 
 # Create necessary directories and set permissions
-RUN mkdir -p /app/uploads/rooms /app/static/uploads && \
+RUN mkdir -p /app/uploads/rooms /app/uploads/profile_pics /app/static/uploads && \
     chown -R celery:celery /app && \
     chmod -R 755 /app/uploads
 

app.py

@@ -136,7 +136,7 @@ app = create_app()
 
 @app.route('/uploads/profile_pics/<filename>')
 def profile_pic(filename):
-    return send_from_directory(os.path.join(os.getcwd(), 'uploads', 'profile_pics'), filename)
+    return send_from_directory('/app/uploads/profile_pics', filename)
 
 if __name__ == '__main__':
     app.run(debug=True) 

routes/admin.py

@@ -13,7 +13,7 @@ def sync_files():
         return jsonify({'error': 'Unauthorized'}), 403
     
     try:
-        DATA_ROOT = '/data/rooms'
+        DATA_ROOT = '/app/uploads/rooms'
         admin_user = User.query.filter_by(is_admin=True).first()
         if not admin_user:
             return jsonify({'error': 'No admin user found'}), 500
@@ -73,7 +73,7 @@ def verify_db_state():
         return jsonify({'error': 'Unauthorized'}), 403
     
     try:
-        DATA_ROOT = '/data/rooms'
+        DATA_ROOT = '/app/uploads/rooms'
         verification_results = {
             'rooms_checked': 0,
             'files_in_db_not_fs': [],
@@ -208,7 +208,7 @@ def cleanup_orphaned_records():
         return jsonify({'error': 'Unauthorized'}), 403
     
     try:
-        DATA_ROOT = '/data/rooms'
+        DATA_ROOT = '/app/uploads/rooms'
         rooms = Room.query.all()
         cleaned_records = []
         

routes/contacts.py

@@ -15,7 +15,7 @@ import string
 
 contacts_bp = Blueprint('contacts', __name__, url_prefix='/contacts')
 
-UPLOAD_FOLDER = os.path.join(os.getcwd(), 'uploads', 'profile_pics')
+UPLOAD_FOLDER = '/app/uploads/profile_pics'
 if not os.path.exists(UPLOAD_FOLDER):
     os.makedirs(UPLOAD_FOLDER)
 

routes/main.py

@@ -332,7 +332,7 @@ def init_routes(main_bp):
             is_admin=current_user.is_admin
         )
 
-    UPLOAD_FOLDER = os.path.join(os.getcwd(), 'uploads', 'profile_pics')
+    UPLOAD_FOLDER = '/app/uploads/profile_pics'
     if not os.path.exists(UPLOAD_FOLDER):
         os.makedirs(UPLOAD_FOLDER)
 

routes/room_files.py

@@ -217,7 +217,6 @@ def upload_room_file(room_id):
         
         # If we are overwriting, delete the trashed file record
         db.session.delete(trashed_file)
-        db.session.commit()
         existing_file = None
     
     file.save(file_path)
@@ -347,6 +346,19 @@ def delete_file(room_id, filename):
     if not rf:
         return jsonify({'error': 'File not found'}), 404
     
+    # If it's a folder, mark all contained items as deleted
+    if rf.type == 'folder':
+        folder_path = os.path.join(rf.path, rf.name) if rf.path else rf.name
+        contained_items = RoomFile.query.filter(
+            RoomFile.room_id == room_id,
+            RoomFile.path.like(f"{folder_path}%")
+        ).all()
+        
+        for item in contained_items:
+            item.deleted = True
+            item.deleted_by = current_user.id
+            item.deleted_at = datetime.utcnow()
+    
     # Mark as deleted and record who deleted it and when
     rf.deleted = True
     rf.deleted_by = current_user.id
@@ -1053,6 +1065,9 @@ def delete_permanent(room_id):
                     for item in contained_items:
                         db.session.delete(item)
             
+            # Delete the database record
+            db.session.delete(rf)
+                        
             log_event(
                 event_type='file_delete_permanent',
                 details={
@@ -1066,10 +1081,15 @@ def delete_permanent(room_id):
                 user_id=current_user.id
             )
         except Exception as e:
-            print(f"Error deleting {rf.type} from storage: {e}")
+            print(f"Error deleting file {rf.name}: {str(e)}")
+            continue
     
-        # Delete the database record
-        db.session.delete(rf)
+    # Commit all changes
+    try:
+        db.session.commit()
+    except Exception as e:
+        print(f"Error committing changes: {str(e)}")
+        db.session.rollback()
+        return jsonify({'error': 'Failed to delete files'}), 500
     
-    db.session.commit()
     return jsonify({'success': True}) 

routes/rooms.py

@@ -346,7 +346,7 @@ def delete_room(room_id):
         print(f"Attempting to delete room {room_id} ({room_name})")
         
         # Delete physical files
-        room_dir = os.path.join('/data/rooms', str(room_id))
+        room_dir = os.path.join('/app/uploads/rooms', str(room_id))
         if os.path.exists(room_dir):
             shutil.rmtree(room_dir)
             print(f"Deleted room directory: {room_dir}")

static/js/rooms/viewManager.js

@@ -348,13 +348,32 @@ export class ViewManager {
     renderFileActions(file, index) {
         const actions = [];
 
-        // Add details button
-        actions.push(`
-            <button class="btn btn-sm file-action-btn" title="Details" onclick="window.roomManager.modalManager.showDetailsModal('${file.name}', '${file.path || ''}')"
-                style="background-color:var(--primary-opacity-8);color:var(--primary-color);">
-                <i class="fas fa-info-circle"></i>
-            </button>
-        `);
+        // Check if file can be previewed
+        const extension = file.name.split('.').pop().toLowerCase();
+        const previewableExtensions = [
+            'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx',
+            'txt', 'md', 'csv', 'py', 'js', 'html', 'css', 'json', 'xml', 'sql', 'sh', 'bat',
+            'jpg', 'jpeg', 'png', 'gif', 'bmp', 'svg', 'webp', 'tiff',
+            'mp3', 'mp4', 'webm', 'avi', 'mov', 'wmv', 'flv', 'mkv'
+        ];
+
+        if (previewableExtensions.includes(extension)) {
+            // Add preview button for previewable files
+            actions.push(`
+                <button class="btn btn-sm file-action-btn" title="Preview" onclick="window.roomManager.viewManager.previewFile(${index})"
+                    style="background-color:var(--primary-opacity-8);color:var(--primary-color);">
+                    <i class="fas fa-eye"></i>
+                </button>
+            `);
+        } else {
+            // Add details button for non-previewable files
+            actions.push(`
+                <button class="btn btn-sm file-action-btn" title="Details" onclick="window.roomManager.modalManager.showDetailsModal('${file.name}', '${file.path || ''}')"
+                    style="background-color:var(--primary-opacity-8);color:var(--primary-color);">
+                    <i class="fas fa-info-circle"></i>
+                </button>
+            `);
+        }
 
         // Add download button if user has permission
         if (this.roomManager.canDownload) {

sync_room_files.py

@@ -3,7 +3,7 @@ from datetime import datetime
 from app import create_app
 from models import db, Room, RoomFile, User
 
-DATA_ROOT = '/data/rooms'
+DATA_ROOT = '/app/uploads/rooms'
 
 app = create_app()
 

tasks.py

@@ -20,7 +20,7 @@ def cleanup_trash():
         try:
             # Delete the file from storage if it's a file
             if file.type == 'file':
-                file_path = os.path.join('/data/rooms', str(file.room_id), file.path, file.name)
+                file_path = os.path.join('/app/uploads/rooms', str(file.room_id), file.path, file.name)
                 if os.path.exists(file_path):
                     os.remove(file_path)