From 3e3451adda28c3f2d1d8c169f255f5a9ae7c5639 Mon Sep 17 00:00:00 2001
From: Kobe <kobeamerijckx@outlook.com>
Date: Tue, 27 May 2025 11:55:54 +0200
Subject: [PATCH] permanent delete folders fix

---
 routes/__pycache__/room_files.cpython-313.pyc | Bin 37698 -> 38323 bytes
 routes/room_files.py                          |  11 +++++++++++
 2 files changed, 11 insertions(+)

diff --git a/routes/__pycache__/room_files.cpython-313.pyc b/routes/__pycache__/room_files.cpython-313.pyc
index e94e7fde7e934a124a1814e2d35b2c48348a03ee..0562f902aab259a6483bd5a544e52563e6dda441 100644
GIT binary patch
delta 824
zcmZutT}YE*6h80g_POty`_WDJIbF_8H>aixU6wy-iA`)X=2&Rfh4@2%EE|DkP(o$?
zr=E+nE>wtI1gS`1Hwhuxg%_@*QAvMz6G|uw-9_)0?ap)Y9L{;4=Q-~=ub(ip&lu&l
zLcs%#onFVejSDl%<DH}xXXIw=h?UKDbm|$wNh)6e_*oyDArfgcF#v7_PIoOxounZh
z@Kw7G2f7Q$ADnMbi1DfmYXKU50o2<uxhe(S22NrGAB*3LwA7bl@&PA`jW}+N|JPD?
z>o{sD#z{G<yAv3{45#m<;Ll_YUMiL2@C^<2l%``{sYdUUDZv|?$2iEY!tq~OW5A)t
zBpv7DG*D@xALi=|cNqXR#pr3$U|Wx7xQb6Of;$aB4o29EVe+vNYa=*`dv0$ksi5QZ
zm~&dSpR<#QA`McZzAQ2}8t8GrFRw3;bi8rmg$~dSG(Nc!@+1+V5mLZQsYm72*LQOZ
zX@Qcc6lfu~_-b6gZN@{rRwnQn&-7*yGj{df%?f;{zJXIB{18DU!gCR(D1727t~EBd
zUOj)=9~j0f4lTaDqe53-Qe0p~<gAOZAreV5es$>ZW?vH1#Nea8P34->(8YXF#eR&@
zZn7F2?LSD~;c~y_)|yuTz&-39x2<TiH(974PO|7+bUrpsS|_ZN*%R5pz*O7QwmD`#
z`epQrschNf4SQ-sp4!0^tCpNe|AaqmDGFJNRs~~N$Os7;L1#$Fqt%#VR1p?3LqcZo
zV({!->T*``d!b}o8f8uR&4Nxp)QHWS(Zvv-w#`GTeMGV<=*Rd`J}lTmf-RW#LCD>T
zq7OSUz{&6P-F#S<7?LH9n8Gr{RspE??G&P6z+*Pjg%@&<aW0m5bGZBnO-n5Aa!8ld
jNiMr|$u4y{W(NlzN`!o3*^UB6EkYI9lF&L(N5y{uj=tT0

delta 460
zcmdnIn(5FoCce+Syj%=G5YTO!F*#!+pIaN#E|$p!Zc39I1UWW0v`H~ZdfaAU$YTp-
z(*UUhf)pkO245Zq2D!-#Z4@RiP#2#3qN9&F(U)QJzAEv_lRC{A)h6$+5}W*>lbum)
z@{3MArf7@FdG<1s*V&6s{@KmV<$ITbftx{r0V+JNTV%3BkEp(IFsA{dDI>%Z6$V9y
zXcGvVfq|VNQ5EP2j%ah3NU$Kt4g)@hV4+YBJ_chJm_`K#d4^!1Qb!KI3J9IXn8sks
zEYFa}s3|h}RFC&$sa_36g~`snt!lS8T`Q7P3raHc^NJ<`jV|H`5$iz2dJwSzNN93S
z-q#{IS*%Z*`4(g9<cY;1lcV~inJzF+F7Nxm_n1$%gXtc>;7uNp4{RKhOZ&|jFHT<5
zucm%SL~6S4B;N&^S44Eaa4~Rl_j7e}UFVRz$RRmH=^BUZM@0sHxi2b{dnW`c$pfu9
zqUXfnq0My6Tn$K`(B|@#Vm)Ch?J3H7Qk2zGYBS@+Su7HojB1~m8JGk>gcsvS79hVU
H5~vpd|Eqcd

diff --git a/routes/room_files.py b/routes/room_files.py
index 5bd7da9..fd3065c 100644
--- a/routes/room_files.py
+++ b/routes/room_files.py
@@ -676,7 +676,18 @@ def delete_permanent(room_id):
                 if rf.type == 'file':
                     os.remove(file_path)
                 elif rf.type == 'folder':
+                    # For folders, we need to delete all contents recursively
                     shutil.rmtree(file_path)
+                    
+                    # Also delete all database records for files and subfolders
+                    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:
+                        db.session.delete(item)
         except Exception as e:
             print(f"Error deleting {rf.type} from storage: {e}")