Skip to content

Dev/dashboard #51

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 2 commits into from
Apr 28, 2024
Merged

Dev/dashboard #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dce4b4
删除一些东西*
tianxiu2b2t Apr 27, 2024
64df172
修复文件流量的问题
tianxiu2b2t Apr 28, 2024
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
2 changes: 1 addition & 1 deletion bmclapi_dashboard/static/js/index.min.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ class Application {
this.createElement("button").append(
this.createElement("i").class("bx", "bx-user-circle")
).event("click", () => {
modal.open().body(app.createElement("a").setText("cnm"),app.createElement("a").setText("cnm"))
modal.open().body()
})
)
)
Expand Down
51 changes: 18 additions & 33 deletions core/cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ async def get(self, hash: str, offset: int = 0) -> File:
file.cache = True
return file
path = Path(str(self.dir) + f"/{hash[:2]}/{hash}")
file = File(path, hash, 0)
file = File(path, hash, path.stat().st_size)
if CACHE_ENABLE:
buf = io.BytesIO()
async with aiofiles.open(path, "rb") as r:
Expand Down Expand Up @@ -830,64 +830,49 @@ async def _wait_lock(self):
return
await self.lock.wait()

async def get(self, file: str, offset: int = 0) -> File:
if file in self.cache and self.cache[file].expiry - 10 > time.time():
self.cache[file].cache = True
self.cache[file].last_hit = time.time()
return self.cache[file]
async def get(self, hash: str, offset: int = 0) -> File:
if hash in self.cache and self.cache[hash].expiry - 10 > time.time():
self.cache[hash].cache = True
self.cache[hash].last_hit = time.time()
return self.cache[hash]
try:
f = File(
hash,
hash,
size=0,
)
async with aiohttp.ClientSession(
auth=aiohttp.BasicAuth(self.username, self.password)
) as session:
async with session.get(
self.hostname + self._file_endpoint(file[:2] + "/" + file),
self.hostname + self._file_endpoint(hash[:2] + "/" + hash),
allow_redirects=False,
) as resp:
f = File(
file,
file,
size=int(resp.headers.get("Content-Length", 0)),
)
if resp.status == 200:
f.headers = {}
for field in (
"ETag",
"Last-Modified",
"Content-Length",
"Content-Range",
"Accept-Ranges",
):
if field not in resp.headers:
continue
f.headers[field] = resp.headers.get(field)
f.size = int(resp.headers.get("Content-Length", 0))
f.set_data(await resp.read())
if CACHE_ENABLE:
f.expiry = time.time() + CACHE_TIME
self.cache[file] = f
else:
return f
self.cache[hash] = f
elif resp.status // 100 == 3:
f.size = self.get_size(hash)
f.path = resp.headers.get("Location")
expiry = min(
(
0,
*(
float(n)
for n in utils.parse_cache_control(
resp.headers.get("Cache-Control", "")
).values()
if str(n).isnumeric()
),
)
)
expiry = re.search(r"max-age=(\d+)", resp.headers.get("Cache-Control", "")) or 0
if expiry == 0:
return f
f.expiry = time.time() + expiry
if CACHE_ENABLE:
self.cache[file] = f
else:
return f
return self.cache[file]
self.cache[hash] = f
return f
except Exception:
storages.disable(self)
logger.error(traceback.format_exc())
Expand Down