8000 fix: 修复没正确获取到附加参数的问题 · TTB-Network/python-openbmclapi@01998b4 · GitHub
[go: up one dir, main page]
Skip to content

Commit 01998b4

Browse files
tianxiu2b2ttianxiu2b2t
committed
fix: 修复没正确获取到附加参数的问题
1 parent 2bb5092 commit 01998b4

File tree

6 files changed

+8
-13
lines changed

6 files changed

+8
-13
lines changed

‎core/storage/abc.py‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -195,13 +195,7 @@ def path(self) -> 'CPath':
195195

196196
async def write_measure(self, size: int):
197197
path = f"measure/{size}"
198-
try:
199-
file = await self.get_file(path)
200-
size = size * 1024 * 1024
201-
if isinstance(file, (ResponseFileRemote, ResponseFileMemory, ResponseFileLocal)) and file.size == size:
202-
return
203-
except:
204-
pass
198+
size = size * 1024 * 1024
205199

206200
with tempfile.NamedTemporaryFile() as tmp:
207201
tmp.write(b'\x00' * size)
@@ -211,7 +205,7 @@ async def write_measure(self, size: int):
211205
tmp,
212206
size
213207
)
214-
logger.tsuccess("storage.write_measure", size=size / (1024 * 1024), name=self.name, type=self.type)
208+
logger.tsuccess("storage.write_measure", size=int(size / (1024 * 1024)), name=self.name, type=self.type)
215209

216210

217211
def get_py_check_path(self) -> 'CPath':

‎core/storage/alist.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def __init__(
4040
password: str,
4141
**kwargs
4242
):
43-
super().__init__(name, path, weight)
43+
super().__init__(name, path, weight, **kwargs)
4444
self._endpoint = endpoint
4545
self._username = username
4646
self._password = password
@@ -114,6 +114,7 @@ async def _check(self):
114114

115115
async def check_measure(self, size: int):
116116
path = str(self._path / "measure" / size)
117+
print(path)
117118
async with aiohttp.ClientSession(
118119
base_url=self._endpoint,
119120
headers={

‎core/storage/local.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def __init__(
1919
weight: int,
2020
**kwargs
2121
):
22-
super().__init__(name, path, weight)
22+
super().__init__(name, path, weight, **kwargs)
2323

2424
async def setup(
2525
self,

‎core/storage/minio.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def __init__(
3232
bucket: str,
3333
**kwargs
3434
):
35-
super().__init__(name, path, weight)
35+
super().__init__(name, path, weight, **kwargs)
3636

3737
self.endpoint = endpoint
3838
self.bucket = bucket

‎core/storage/s3.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def __init__(
5353
secret_key: str,
5454
**kwargs
5555
):
56-
super().__init__(name, path, weight)
56+
super().__init__(name, path, weight, **kwargs)
5757
self.endpoint = endpoint
5858
self.bucket = bucket
5959
self.access_key = access_key

‎core/storage/webdav.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def __init__(
2626
password: str,
2727
**kwargs
2828
):
29-
super().__init__(name, path, weight)
29+
super().__init__(name, path, weight, **kwargs)
3030
self.endpoint = endpoint
3131
self.username = username
3232
self.password = password

0 commit comments

Comments
 (0)
0