restructured

gramup/main.py

@@ -3,7 +3,6 @@
 import os
 from typing import List
 
-import shortuuid
 from fastapi import FastAPI, HTTPException, Request, BackgroundTasks
 from starlette import status
 from starlette.middleware.cors import CORSMiddleware
@@ -96,6 +95,7 @@ async def tasks_list():
             "id": task.id,
             "name": task.name,
             "status": task.status,
+            "message": task.message,
             "schedule_time": task.schedule_time
         })
 

gramup/models.py

@@ -23,19 +23,18 @@ class File(BaseModel):
 
 class Folder(BaseModel):
     this = peewee.ForeignKeyField(File, backref="this_folder", on_delete="CASCADE")
-    sub_folders = peewee.ManyToManyField(File, backref="parent_folder", on_delete="CASCADE")
     files = peewee.ManyToManyField(File, backref="folder", on_delete="CASCADE")
 
 
 class Task(BaseModel):
     name = peewee.CharField(max_length=128)
     status = peewee.CharField(choices=["running", "completed", "failed"], default="running")
     schedule_time = peewee.DateTimeField(default=datetime.now)
+    message = peewee.CharField(max_length=256, null=True)
 
 
-FolderSubFolder = Folder.sub_folders.get_through_model()
 FolderFile = Folder.files.get_through_model()
 
-db.create_tables([File, FolderSubFolder, FolderFile, Folder, Task])
+db.create_tables([File, FolderFile, Folder, Task])
 
 TaskRequest = TypedDict("TaskRequest", {"path": str, "type": Literal["sync", "upload"]})

gramup/tasks.py

@@ -14,6 +14,7 @@ async def pull_all_to_db(task: Task):
 
     if not await client.is_user_authorized():
         task.status = "failed"
+        task.message = "User not authorized"
         task.save()
         return
 
@@ -22,28 +23,30 @@ async def pull_all_to_db(task: Task):
         caption: str = message.caption
         path = Path(caption if "/" in caption else f"external/{caption}")
 
-        file = File.create(
+        file, _ = File.get_or_create(
             id=m_id,
             path=str(path),
             name=path.name
         )
 
         file.save()
-        first = True
 
         for folder in path.parents:
+            file_new, _ = File.get_or_create(
+                path=str(folder),
+                name=folder.name,
+                folder=True
+            )
+
             folder_new, _ = Folder.get_or_create(
                 path=str(folder),
                 name=folder.name
             )
 
-            if first:
-                first = False
-                folder_new.files.add(file)
-            else:
-                folder_new.sub_folders.add(file)
-
+            folder_new.this = file_new
+            folder_new.files.add(file)
             folder_new.save()
+
             file = folder_new
 
     task.status = "completed"