refactor: remove FileMetaShim in favour of api methods

This commit removes the temporary shim now
that the SDK is up-to-date

Author: ehossack

django_backblaze_b2/b2_filemeta_shim.py

@@ -10,7 +10,6 @@
 from django.utils.deconstruct import deconstructible
 
 from django_backblaze_b2.b2_file import B2File
-from django_backblaze_b2.b2_filemeta_shim import FileMetaShim
 from django_backblaze_b2.options import BackblazeB2StorageOptions, getDefaultB2StorageOptions
 
 logger = getLogger("django-backblaze-b2")
@@ -101,17 +100,22 @@ def path(self, name: str) -> str:
 
     def delete(self, name: str) -> None:
         try:
-            fileId = FileMetaShim(self.b2Api, self.bucket, name).id
-            logger.debug(f"Deleting file {name} id=({fileId})")
-            self.b2Api.delete_file_version(file_id=fileId, file_name=name)
+            fileInfo = self.bucket.get_file_info_by_name(name)
+            logger.debug(f"Deleting file {name} id=({fileInfo.id_})")
+            self.b2Api.delete_file_version(file_id=fileInfo.id_, file_name=name)
         except FileNotPresent:
             logger.debug("Not found")
 
     def exists(self, name: str) -> bool:
-        return FileMetaShim(self.b2Api, self.bucket, name).exists
+        try:
+            self.bucket.get_file_info_by_name(name)
+            return True
+        except FileNotPresent:
+            return False
 
     def size(self, name: str) -> int:
-        return FileMetaShim(self.b2Api, self.bucket, name).contentLength
+        fileInfo = self.bucket.get_file_info_by_name(name)
+        return fileInfo.size if fileInfo.size is not None else 0
 
     def url(self, name: Optional[str]) -> str:
         if not name:

django_backblaze_b2/storage.py

@@ -2,13 +2,12 @@
 from unittest import mock
 
 import pytest
-from b2sdk.exception import B2Error, ServiceError
-from b2sdk.v1 import B2Api
+from b2sdk.exception import FileNotPresent
+from b2sdk.file_version import FileVersionInfoFactory
+from b2sdk.v1 import B2Api, Bucket
 from b2sdk.v1.exception import NonExistentBucket
 from django.core.exceptions import ImproperlyConfigured
 from django_backblaze_b2 import BackblazeB2Storage
-from django_backblaze_b2.b2_filemeta_shim import FileMetaShim
-from requests import HTTPError, Response
 
 
 def test_requiresConfiguration():
@@ -130,9 +129,15 @@ def test_urlRequiresName(settings):
 
 
 def test_get_available_nameWithOverwrites(settings):
+    mockedBucket = mock.Mock(spec=Bucket)
+    mockedBucket.get_file_info_by_name.return_value = FileVersionInfoFactory.from_response_headers(
+        {"id_": 1, "file_name": "some_name.txt"}
+    )
+
     with mock.patch.object(settings, "BACKBLAZE_CONFIG", _settingsDict({})), mock.patch.object(
         B2Api, "authorize_account"
-    ), mock.patch.object(B2Api, "get_bucket_by_name"), mock.patch.object(FileMetaShim, "exists", return_value=True):
+    ), mock.patch.object(B2Api, "get_bucket_by_name") as api:
+        api.return_value = mockedBucket
         storage = BackblazeB2Storage(opts={"allowFileOverwrites": True})
 
         availableName = storage.get_available_name("some_name.txt", max_length=None)
@@ -157,62 +162,19 @@ def test_notImplementedMethods(settings):
 
 
 def test_existsFileDoesNotExist(settings):
-    fileMetaResponse = mock.Mock(spec=Response)
-    fileMetaResponse.status_code = 404
+    mockedBucket = mock.Mock(spec=Bucket)
+    mockedBucket.get_file_info_by_name.side_effect = FileNotPresent()
 
     with mock.patch.object(settings, "BACKBLAZE_CONFIG", _settingsDict({})), mock.patch.object(
         B2Api, "authorize_account"
-    ), mock.patch.object(B2Api, "get_bucket_by_name"), mock.patch.object(
-        FileMetaShim, "_get_head_response", side_effect=HTTPError(response=fileMetaResponse)
-    ) as patchedHead:
+    ), mock.patch.object(B2Api, "get_bucket_by_name") as api:
+        api.return_value = mockedBucket
         storage = BackblazeB2Storage(opts={})
 
         doesFileExist = storage.exists("some/file.txt")
 
         assert not doesFileExist
-        assert patchedHead.call_count == 1
-
-
-def test_existsServerErrorInterpretationAndRetry(settings):
-    fileMetaResponse = mock.Mock(spec=Response)
-    fileMetaResponse.status_code = 500
-    fileMetaResponse.headers = {}
-
-    with mock.patch.object(settings, "BACKBLAZE_CONFIG", _settingsDict({})), mock.patch.object(
-        B2Api, "authorize_account"
-    ), mock.patch.object(B2Api, "get_bucket_by_name"), mock.patch.object(
-        B2Api, "authorize_automatically", return_value=True
-    ), mock.patch.object(
-        FileMetaShim, "_get_head_response", side_effect=HTTPError(response=fileMetaResponse)
-    ) as patchedHead:
-        storage = BackblazeB2Storage(opts={})
-
-        with pytest.raises(B2Error) as raised:
-            storage.exists("some/file.txt")
-
-        assert isinstance(raised.value, ServiceError)
-        assert patchedHead.call_count == 4
-
-
-def test_existsServerErrorDoesNotRetryIfCantAuth(settings):
-    fileMetaResponse = mock.Mock(spec=Response)
-    fileMetaResponse.status_code = 500
-    fileMetaResponse.headers = {}
-
-    with mock.patch.object(settings, "BACKBLAZE_CONFIG", _settingsDict({})), mock.patch.object(
-        B2Api, "authorize_account"
-    ), mock.patch.object(B2Api, "get_bucket_by_name"), mock.patch.object(
-        B2Api, "authorize_automatically", return_value=False
-    ), mock.patch.object(
-        FileMetaShim, "_get_head_response", side_effect=HTTPError(response=fileMetaResponse)
-    ) as patchedHead:
-        storage = BackblazeB2Storage(opts={})
-
-        with pytest.raises(B2Error) as raised:
-            storage.exists("some/file.txt")
-
-        assert isinstance(raised.value, ServiceError)
-        assert patchedHead.call_count == 1
+        assert mockedBucket.get_file_info_by_name.call_count == 1
 
 
 def _settingsDict(config: Dict[str, Any]) -> Dict[str, Any]: