Skip to content

回滚一些代码 #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 2, 2024
Merged

回滚一些代码 #60

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 2 additions & 19 deletions core/cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ def __init__(self, name: str, dir: Path, width: int) -> None:
if self.dir.is_file():
raise FileExistsError(f"Cannot copy file: '{self.dir}': Is a file.")
self.dir.mkdir(exist_ok=True, parents=True)
self.cache: CacheManager = CacheManager(FileType.LOCAL, FileContentType.DATA if CACHE_ENABLE else FileContentType.PATH)
self.cache: dict[str, File] = {}
self.timer = scheduler.repeat(
self.clear_cache, delay=CHECK_CACHE, interval=CHECK_CACHE
)
Expand Down Expand Up @@ -902,7 +902,7 @@ async def write(self, hash: str, io: io.BytesIO) -> int:
path = self._file_endpoint(f"{hash[:2]}/{hash}")
await self._mkdir(self._file_endpoint(f"{hash[:2]}"))
await self._execute(self.session.upload_to(io.getbuffer(), path))
self.files[hash] = File(path, hash, len(io.getbuffer()))
self.files[hash] = File(path, hash, len(io.getbuffer()), FileContentType.URL)
return self.files[hash].size

async def get_files(self, dir: str) -> list[str]:
Expand Down Expand Up @@ -1341,27 +1341,10 @@ async def message(self, channel, data: list[Any], callback=None):
logger.error(traceback.format_exc())


class CacheManager:
def __init__(self, type: FileType, data: FileContentType):
self.type = type
self.data = data
self.cache: dict[str, File] = {}

def set(self, key: str, value: File) -> File:
self.cache[key] = value
return value

def get_or_default(self, key: str) -> Optional[File]:
if key not in self.cache:
return None
return self.cache[key]


token = TokenManager()
cluster: Optional[Cluster] = None
last_status: str = "-"
storages = StorageManager()
cache: CacheManager = CacheManager()

async def init():
if CLUSTER_ID == "":
Expand Down