Develop to main (#90)

* fix: fix folder creation logic to ensure CurrentFolder is valid before proceeding

* fix: solve upload to empty folder and upload to root folder

* fix: solve folder problem

Author: mateof

TelegramDownloader/Data/FileService.cs

@@ -1073,12 +1073,18 @@ public async Task importSharedData(ShareFilesModel sfm, GenericNotificationProgr
 
         public async Task<List<Syncfusion.Blazor.FileManager.FileManagerDirectoryContent>> createFolder(string dbName, FolderCreateEventArgs<Syncfusion.Blazor.FileManager.FileManagerDirectoryContent> args)
         {
-            return (await _db.createEntry(dbName, await _db.toBasonFile(args.Path, args.FolderName, args.ParentFolder))).Select(x => x.toFileManagerContent()).ToList();
+            var result = (await _db.createEntry(dbName, await _db.toBasonFile(args.Path, args.FolderName, args.ParentFolder))).Select(x => x.toFileManagerContent()).ToList();
+            if (!string.IsNullOrEmpty(args.ParentFolder?.Id))
+                await _db.setDirectoryHasChild(dbName, args.ParentFolder.Id);
+            return result;
         }
 
         public async Task<List<Syncfusion.Blazor.FileManager.FileManagerDirectoryContent>> createFolder(string dbName, string path, string folderName, Syncfusion.Blazor.FileManager.FileManagerDirectoryContent? parentFolder)
         {
-            return (await _db.createEntry(dbName, await _db.toBasonFile(path, folderName, parentFolder))).Select(x => x.toFileManagerContent()).ToList();
+            var result = (await _db.createEntry(dbName, await _db.toBasonFile(path, folderName, parentFolder))).Select(x => x.toFileManagerContent()).ToList();
+            if (!string.IsNullOrEmpty(parentFolder?.Id))
+                await _db.setDirectoryHasChild(dbName, parentFolder.Id);
+            return result;
         }
 
         public async Task CreateDatabase(string id)
@@ -1608,12 +1614,18 @@ public async Task UploadFileFromServer(string dbName, string currentPath, List<S
                         }
                     }
                     BsonFileManagerModel parent = await _db.getParentDirectoryByPath(dbName, currentPath);
+                    if (parent == null)
+                    {
+                        parent = await _db.getRootFolder(dbName);
+                    }
                     model.Name = file.IsFile ? fileInfo.Name : file.Name;
                     model.IsFile = file.IsFile;
                     model.HasChild = false;
                     model.DateCreated = DateTime.Now;
                     model.DateModified = DateTime.Now;
-                    model.FilterPath = (currentPath == "/" || currentPath == "File/") ? currentPath : string.Concat(parent.FilterPath, parent.Name, "/");
+                    model.FilterPath = parent.FilterPath == ""
+                        ? "/"
+                        : string.Concat(parent.FilterPath, parent.Name, "/");
                     model.FilterId = string.Concat(parent.FilterId, parent.Id.ToString(), "/");
                     model.ParentId = parent.Id;
                     model.FilePath = System.IO.Path.Combine(currentPath, file.IsFile ? fileInfo.Name : file.Name);
@@ -1858,14 +1870,20 @@ public async Task UploadFile(string dbName, string currentPath, UploadFiles file
                 }
 
                 BsonFileManagerModel parent = await _db.getParentDirectoryByPath(dbName, currentPath);
+                if (parent == null)
+                {
+                    parent = await _db.getRootFolder(dbName);
+                }
                 _logger.LogDebug("Parent directory found - ParentId: {ParentId}, ParentName: {ParentName}", parent?.Id, parent?.Name);
 
                 model.Name = file.File.Name;
                 model.IsFile = true;
                 model.HasChild = false;
                 model.DateCreated = DateTime.Now;
                 model.DateModified = DateTime.Now;
-                model.FilterPath = string.Concat(parent.FilterPath, parent.Name, "/");
+                model.FilterPath = parent.FilterPath == ""
+                    ? "/"
+                    : string.Concat(parent.FilterPath, parent.Name, "/");
                 model.FilterId = string.Concat(parent.FilterId, parent.Id.ToString(), "/");
                 model.ParentId = parent.Id;
                 model.FilePath = System.IO.Path.Combine(currentPath, file.File.Name);

TelegramDownloader/Shared/MobileFileManager/MobileFileManager.razor.cs

@@ -892,29 +892,27 @@ private async Task ConfirmNewFolder()
         {
             if (string.IsNullOrWhiteSpace(NewFolderName)) return;
 
-            // Use CurrentFolder which has the correct Id from LoadFiles response
-            FileManagerDirectoryContent parentFolder;
-            if (CurrentFolder != null)
+            // If CurrentFolder is missing or has no Id, refresh from the server first
+            if (CurrentFolder == null || string.IsNullOrEmpty(CurrentFolder.Id))
             {
-                parentFolder = new FileManagerDirectoryContent
-                {
-                    Id = CurrentFolder.Id,
-                    Name = CurrentFolder.Name,
-                    FilterPath = NormalizePath(CurrentFolder.FilterPath ?? ""),
-                    FilterId = CurrentFolder.FilterId,
-                    IsFile = false
-                };
+                await LoadFiles();
             }
-            else
+
+            // After refresh, if we still don't have a valid CurrentFolder with Id, abort
+            if (CurrentFolder == null || string.IsNullOrEmpty(CurrentFolder.Id))
             {
-                // Fallback for root - this shouldn't normally happen as LoadFiles sets CurrentFolder
-                parentFolder = new FileManagerDirectoryContent
-                {
-                    FilterPath = NormalizePath(CurrentPath),
-                    IsFile = false
-                };
+                return;
             }
 
+            var parentFolder = new FileManagerDirectoryContent
+            {
+                Id = CurrentFolder.Id,
+                Name = CurrentFolder.Name,
+                FilterPath = string.IsNullOrEmpty(CurrentFolder.FilterPath) ? "" : NormalizePath(CurrentFolder.FilterPath),
+                FilterId = CurrentFolder.FilterId ?? "",
+                IsFile = false
+            };
+
             var args = new MfmFolderCreateEventArgs
             {
                 FolderName = NewFolderName,