Remove dead hosting userscloud.com

Add support of nested folders for mega.nz
zenden2k · Aug 11, 2024 · 55f69a1 · 55f69a1
1 parent 99916fc
commit 55f69a1
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 85 deletions.
diff --git a/Data/Favicons/userscloud.ico b/Data/Favicons/userscloud.ico
diff --git a/Data/Scripts/userscloud.nut b/Data/Scripts/userscloud.nut
diff --git a/Data/servers.xml b/Data/servers.xml
@@ -301,11 +301,6 @@
 		</Actions>
 		<Result DownloadUrlTemplate="stub"/>
 	</Server>
-	<Server Name="userscloud.com" FileHost="1" Plugin="userscloud" WebsiteUrl="https://userscloud.com" RegistrationUrl="https://userscloud.com/signup">
-		<Actions>
-		</Actions>
-		<Result ImageUrlTemplate="stub" ThumbUrlTemplate="stub" DownloadUrlTemplate="stub"/>
-	</Server>
 	<!-- Blocked by Roskomnadzor -->
 	<Server Name="catbox.moe" Authorize="1" FileHost="1" MaxFileSize="200000000" PasswordLabel="userhash" WebsiteUrl="https://catbox.moe/" 
 		RegistrationUrl="https://catbox.moe/user/register.php">

diff --git a/Source/Core/Upload/MegaNzUploadEngine.cpp b/Source/Core/Upload/MegaNzUploadEngine.cpp
@@ -252,18 +252,34 @@ int CMegaNzUploadEngine::getFolderList(CFolderList& FolderList) {
     }
     folderList_ = &FolderList;
     if (ensureNodesFetched()) {
-        FolderList.AddFolder("/", "", std::string("/"), "", 0);
-        MegaNode *root = megaApi_->getRootNode();
-        MegaNodeList *list = megaApi_->getChildren(root);
-
-        for (int i = 0; i < list->size(); i++) {
-            MegaNode *node = list->get(i);
-            if (node->isFolder()) {
-                FolderList.AddFolder(node->getName(), "", std::string("/")+node->getName(), "/", 0);
+        std::string parentId = FolderList.parentFolder().getId();
+
+        if (parentId.empty()) {
+            FolderList.AddFolder("/", "", std::string("/"), "", 0);
+        } else {
+            MegaNode* parent = megaApi_->getNodeByPath(parentId.c_str());
+            if (parent) {
+                MegaNodeList* list = megaApi_->getChildren(parent);
+
+                if (list) {
+                    for (int i = 0; i < list->size(); i++) {
+                        MegaNode* node = list->get(i);
+                        if (node->isFolder()) {
+                            std::string nodeId = parentId;
+
+                            // nodeId cannot be empty at this line, so we can avoid checking for emptiness here.
+                            if (nodeId.back() != '/') { 
+                                nodeId.append("/");
+                            }
+                            nodeId += node->getName();
+                            FolderList.AddFolder(node->getName(), "", nodeId, parentId, 0);
+                        }
+                    }
+                }
+                delete list;
+                delete parent;
             }
         }
-        delete list;
-        delete root;
     }
 
     return fetchNodesSuccess_ ? 1 : 0;
@@ -605,4 +621,4 @@ void MyListener::onNodesUpdate(MegaApi* api, MegaNodeList *nodes)
 
     //std::cout << "***** There are " << nodes->size() << " new or updated node/s in your account" << std::endl;
 }
-#endif
+#endif