Skip to content

remove find implementation #285

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

Closed
skshetry wants to merge 2 commits into from
Closed

remove find implementation #285

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6c83b2
fs: remove find
skshetry Jun 19, 2023
f976876
cache path->id
skshetry Jun 20, 2023
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
50 changes: 5 additions & 45 deletions pydrive2/fs/spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,12 +441,14 @@ def ls(self, path, detail=False):
root_path = posixpath.join(bucket, base)
contents = []
for item in self._gdrive_list_ids(dir_ids):
item_path = posixpath.join(root_path, item["title"])
item_path = posixpath.join(base, item["title"])
full_path = posixpath.join(root_path, item["title"])
if item["mimeType"] == FOLDER_MIME_TYPE:
self._cache_path_id(item_path, item["id"])
contents.append(
{
"type": "directory",
"name": item_path.rstrip("/") + "/",
"name": full_path.rstrip("/") + "/",
"size": 0,
}
)
Expand All @@ -455,7 +457,7 @@ def ls(self, path, detail=False):
contents.append(
{
"type": "file",
"name": item_path,
"name": full_path,
"size": int(size) if size is not None else size,
"checksum": item.get("md5Checksum"),
}
Expand All @@ -469,48 +471,6 @@ def ls(self, path, detail=False):
else:
return [content["name"] for content in contents]

def find(self, path, detail=False, **kwargs):
bucket, base = self.split_path(path)

seen_paths = set()
dir_ids = [self._ids_cache["ids"].copy()]
contents = []
while dir_ids:
query_ids = {
dir_id: dir_name
for dir_id, dir_name in dir_ids.pop().items()
if posixpath.commonpath([base, dir_name]) == base
if dir_id not in seen_paths
}
if not query_ids:
continue

seen_paths |= query_ids.keys()

new_query_ids = {}
dir_ids.append(new_query_ids)
for item in self._gdrive_list_ids(query_ids):
parent_id = item["parents"][0]["id"]
item_path = posixpath.join(query_ids[parent_id], item["title"])
if item["mimeType"] == FOLDER_MIME_TYPE:
new_query_ids[item["id"]] = item_path
self._cache_path_id(item_path, item["id"])
continue
size = item.get("fileSize")
contents.append(
{
"name": posixpath.join(bucket, item_path),
"type": "file",
"size": int(size) if size is not None else size,
"checksum": item.get("md5Checksum"),
}
)

if detail:
return {content["name"]: content for content in contents}
else:
return [content["name"] for content in contents]

def upload_fobj(self, stream, rpath, callback=None, **kwargs):
parent_id = self._get_item_id(self._parent(rpath), create=True)
if callback:
Expand Down