修补bug

Author: cxykevin

src/stealthimfilestorage/config.py

@@ -34,3 +34,4 @@ def load_cfg(cfg_path: str = "config.toml"):
 async def reload_cfg():
     global last_config_path
     await asyncio.to_thread(lambda: load_cfg(last_config_path))
+    print("[CONF]Config Reloaded")

src/stealthimfilestorage/server.py

@@ -45,6 +45,6 @@ async def GetUsage(data: filestorage_pb2.GetUsageRequest) -> filestorage_pb2.Get
 
 
 @serv.serve
-async def Reload(_: filestorage_pb2.ReloadRequest) -> filestorage_pb2.ReloadResponse:
-    await config.reload_cfg()
+async def Reload(data: filestorage_pb2.ReloadRequest) -> filestorage_pb2.ReloadResponse:
+    asyncio.create_task(config.reload_cfg())
     return filestorage_pb2.ReloadResponse(result=filestorage_pb2.Result(code=0, msg=""))

src/stealthimfilestorage/storage.py

@@ -13,7 +13,7 @@ async def save(bytes: bytes, hashstr: str, block_id: int) -> None:
     usage += 1
     try:
         hash_head = hashstr[:2]
-        await aiofiles.os.makedirs(f"{config.Storage_Dir}{os.sep}{hash_head}", exist_ok=True)
+        await aiofiles.os.makedirs(f"{config.Storage_Dir}{os.sep}{hash_head}{os.sep}{hashstr}", exist_ok=True)
         assert await aiofiles.os.path.exists(f"{config.Storage_Dir}{os.sep}{hash_head}{os.sep}{hashstr}{os.sep}{block_id}") is False
         async with aiofiles.open(f"{config.Storage_Dir}{os.sep}{hash_head}{os.sep}{hashstr}{os.sep}{block_id}", "wb") as f:
             await f.write(bytes)
@@ -33,18 +33,25 @@ async def get(hashstr: str, block_id: int) -> bytes:
 
 async def delete(hashstr: str) -> None:
     global usage
-    usage -= 1
     hash_head = hashstr[:2]
+    usage_ln = 0
     try:
+        usage_ln = len(os.listdir(
+            f"{config.Storage_Dir}{os.sep}{hash_head}{os.sep}{hashstr}"))
+        usage -= usage_ln
         await asyncio.to_thread(lambda: shutil.rmtree(f"{config.Storage_Dir}{os.sep}{hash_head}{os.sep}{hashstr}"))
     except Exception:
-        usage += 1
+        usage += usage_ln
 
 
 def get_usage():
     global usage
     usage = 0
-    usage_tmp = 0
-    usage_tmp = sum(len(os.listdir(f"{config.Storage_Dir}{os.sep}{i}"))
-                    for i in os.listdir(str(config.Storage_Dir)))
+    usage_tmp = sum(
+        sum(
+            len(
+                os.listdir(f"{config.Storage_Dir}{os.sep}{i}{os.sep}{j}")
+            ) for j in os.listdir(f"{config.Storage_Dir}{os.sep}{i}")
+        ) for i in os.listdir(f"{config.Storage_Dir}{os.sep}")
+    )
     usage = usage_tmp