Compare commits

..

3 Commits

Author SHA1 Message Date
Josiah Baldwin
cd7a356eb5 Merge pull request #7 from HuFlungDu/release/1.0.0
1.0.0 release
2024-12-13 16:43:12 -08:00
Josiah Baldwin
5ee2c8edf3 1.0.0 release 2024-12-13 16:39:59 -08:00
Josiah Baldwin
d3d5b87287 Fixed various issues with (down/up)load file functions not passing through arguments 2024-12-13 08:51:49 -08:00
2 changed files with 6 additions and 6 deletions

View File

@@ -2,7 +2,7 @@
Changelog Changelog
========= =========
Version 0.1 Version 1.0.0
=========== ===========
Create First release

View File

@@ -1844,7 +1844,7 @@ class Session(object):
node = await self.device_info(node) node = await self.device_info(node)
if unique_file_tunnel: if unique_file_tunnel:
async with self.file_explorer(node) as files: async with self.file_explorer(node) as files:
return await files.upload(source, target) return await files.upload(source, target, timeout=timeout)
else: else:
files = await self._cached_file_explorer(node, node.nodeid) files = await self._cached_file_explorer(node, node.nodeid)
return await files.upload(source, target, timeout=timeout) return await files.upload(source, target, timeout=timeout)
@@ -1898,12 +1898,12 @@ class Session(object):
start = target.tell() start = target.tell()
if unique_file_tunnel: if unique_file_tunnel:
async with self.file_explorer(node) as files: async with self.file_explorer(node) as files:
await files.download(source, target) await files.download(source, target, skip_http_attempt=skip_http_attempt, skip_ws_attempt=skip_ws_attempt, timeout=timeout)
target.seek(start) target.seek(start)
return target return target
else: else:
files = await self._cached_file_explorer(node, node.nodeid) files = await self._cached_file_explorer(node, node.nodeid)
await files.download(source, target, timeout=timeout) await files.download(source, target, skip_http_attempt=skip_http_attempt, skip_ws_attempt=skip_ws_attempt, timeout=timeout)
target.seek(start) target.seek(start)
return target return target
@@ -1928,7 +1928,7 @@ class Session(object):
None None
''' '''
with open(filepath, "wb") as f: with open(filepath, "wb") as f:
await self.download(node, source, f, unique_file_tunnel, timeout=timeout) await self.download(node, source, f, skip_http_attempt=skip_http_attempt, skip_ws_attempt=skip_ws_attempt, unique_file_tunnel=unique_file_tunnel, timeout=timeout)
async def _cached_file_explorer(self, node, _id): async def _cached_file_explorer(self, node, _id):
if (_id not in self._file_tunnels or not self._file_tunnels[_id].alive): if (_id not in self._file_tunnels or not self._file_tunnels[_id].alive):