Skip to content
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.

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

Fixing the problem that arises when using --clear in python manage.py collectstatic #1403

Merged
merged 3 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 8 additions & 12 deletions storages/backends/azure_storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,9 @@ def get_available_name(self, name, max_length=_AZURE_NAME_MAX_LEN):
return super().get_available_name(name, max_length)

def exists(self, name):
if not name:
return True

blob_client = self.client.get_blob_client(self._get_valid_path(name))
return blob_client.exists()

Expand Down Expand Up @@ -390,16 +393,9 @@ def list_all(self, path=""):

def listdir(self, path=""):
"""
Return directories and files for a given path.
Leave the path empty to list the root.
Order of dirs and files is undefined.
Return all files for a given path.
Given that Azure can't return paths it only returns files.
Works great for our little adventure.
"""
files = []
dirs = set()
for name in self.list_all(path):
n = name[len(path) :]
if "/" in n:
dirs.add(n.split("/", 1)[0])
else:
files.append(n)
return list(dirs), files

return [], self.list_all(path)
Frodothedwarf marked this conversation as resolved.
Show resolved Hide resolved
37 changes: 3 additions & 34 deletions tests/test_azure.py
Original file line number Diff line number Diff line change
Expand Up @@ -388,46 +388,15 @@ def test_storage_listdir_base(self):
)
self.storage._custom_client.list_blobs.assert_not_called()

self.assertEqual(len(dirs), 2)
for directory in ["some", "other"]:
self.assertTrue(
directory in dirs,
""" "{}" not in directory list "{}".""".format(directory, dirs),
)
self.assertEqual(len(dirs), 0)

self.assertEqual(len(files), 2)
for filename in ["2.txt", "4.txt"]:
self.assertEqual(len(files), 4)
for filename in ["2.txt", "4.txt", "other/path/3.txt", "some/path/1.txt"]:
self.assertTrue(
filename in files,
""" "{}" not in file list "{}".""".format(filename, files),
)

def test_storage_listdir_subdir(self):
file_names = ["some/path/1.txt", "some/2.txt"]

result = []
for p in file_names:
obj = mock.MagicMock()
obj.name = p
result.append(obj)
self.storage._client.list_blobs.return_value = iter(result)
self.storage._custom_client.list_blobs.assert_not_called()

dirs, files = self.storage.listdir("some/")
self.storage._client.list_blobs.assert_called_with(
name_starts_with="some/", timeout=20
)

self.assertEqual(len(dirs), 1)
self.assertTrue(
"path" in dirs, """ "path" not in directory list "{}".""".format(dirs)
)

self.assertEqual(len(files), 1)
self.assertTrue(
"2.txt" in files, """ "2.txt" not in files list "{}".""".format(files)
)

def test_size_of_file(self):
props = BlobProperties()
props.size = 12
Expand Down
Loading