From 318d792928e8ec5465d96af03d0b39ed0507d0ab Mon Sep 17 00:00:00 2001
From: fmodf <fmodf.ios@gmail.com>
Date: Sat, 13 Jul 2024 18:29:08 +0200
Subject: [PATCH] wip

---
 ConversationsClassic/AppCore/Files/DownloadManager.swift    | 6 +++++-
 .../AppCore/Middlewares/DatabaseMiddleware.swift            | 2 +-
 ConversationsClassic/Helpers/Const.swift                    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ConversationsClassic/AppCore/Files/DownloadManager.swift b/ConversationsClassic/AppCore/Files/DownloadManager.swift
index f19d956..a496212 100644
--- a/ConversationsClassic/AppCore/Files/DownloadManager.swift
+++ b/ConversationsClassic/AppCore/Files/DownloadManager.swift
@@ -27,10 +27,14 @@ final class DownloadManager {
 
                     if let tempLocalUrl = tempLocalUrl, error == nil {
                         do {
+                            let destinationDirectory = localUrl.deletingLastPathComponent()
+                            if !FileManager.default.fileExists(atPath: destinationDirectory.path) {
+                                try FileManager.default.createDirectory(at: destinationDirectory, withIntermediateDirectories: true, attributes: nil)
+                            }
                             if FileManager.default.fileExists(atPath: localUrl.path) {
                                 try FileManager.default.removeItem(at: localUrl)
                             }
-                            try FileManager.default.copyItem(at: tempLocalUrl, to: localUrl)
+                            try FileManager.default.moveItem(at: tempLocalUrl, to: localUrl)
                             completion(nil)
                         } catch let writeError {
                             completion(writeError)
diff --git a/ConversationsClassic/AppCore/Middlewares/DatabaseMiddleware.swift b/ConversationsClassic/AppCore/Middlewares/DatabaseMiddleware.swift
index bf55b06..94e9de3 100644
--- a/ConversationsClassic/AppCore/Middlewares/DatabaseMiddleware.swift
+++ b/ConversationsClassic/AppCore/Middlewares/DatabaseMiddleware.swift
@@ -298,7 +298,7 @@ final class DatabaseMiddleware {
                         _ = try database._db.write { db in
                             try Message
                                 .filter(Column("id") == id)
-                                .updateAll(db, Column("attachmentLocalPath").set(to: localUrl))
+                                .updateAll(db, Column("attachmentLocalPath").set(to: localUrl), Column("attachmentDownloadFailed").set(to: false))
                         }
                         promise(.success(.empty))
                     } catch {
diff --git a/ConversationsClassic/Helpers/Const.swift b/ConversationsClassic/Helpers/Const.swift
index d1cf5a7..f253696 100644
--- a/ConversationsClassic/Helpers/Const.swift
+++ b/ConversationsClassic/Helpers/Const.swift
@@ -33,7 +33,7 @@ enum Const {
     static let videoDurationLimit = 60.0
 
     // Upload/download file folder
-    static let fileFolder = "Downloads"
+    static let fileFolder = "downloads"
 
     // Grid size for gallery preview (3 in a row)
     static let galleryGridSize = UIScreen.main.bounds.width / 3