Improved filesystem storage check

- Basically we need to explicitly tell the storage to sync build media

Author: davidfischer

readthedocs/builds/syncers.py

@@ -14,7 +14,7 @@
 
 from django.conf import settings
 from django.core.exceptions import SuspiciousFileOperation
-from django.core.files.storage import get_storage_class, FileSystemStorage
+from django.core.files.storage import get_storage_class
 
 from readthedocs.core.utils import safe_makedirs
 from readthedocs.core.utils.extend import SettingsOverrideObject
@@ -205,27 +205,23 @@ def get_storage_path(cls, path):
     def copy(cls, path, target, host, is_file=False, **kwargs):  # pylint: disable=arguments-differ
         RemotePuller.copy(path, target, host, is_file, **kwargs)
 
-        if isinstance(storage, FileSystemStorage):
+        if getattr(storage, 'write_build_media', False):
             # This is a sanity check for the case where
             # storage is backed by the local filesystem
             # In that case, removing the original target file locally
             # would remove the file from storage as well
-            return
 
-        if is_file and os.path.exists(target) and \
-                any([target.lower().endswith(ext) for ext in cls.extensions]):
-            log.info("Selective Copy %s to media storage", target)
+            if is_file and os.path.exists(target) and \
+                    any([target.lower().endswith(ext) for ext in cls.extensions]):
+                log.info("Selective Copy %s to media storage", target)
 
-            storage_path = cls.get_storage_path(target)
+                storage_path = cls.get_storage_path(target)
 
-            if storage.exists(storage_path):
-                storage.delete(storage_path)
+                if storage.exists(storage_path):
+                    storage.delete(storage_path)
 
-            with open(target, 'rb') as fd:
-                storage.save(storage_path, fd)
-
-            # remove the original after copying
-            os.remove(target)
+                with open(target, 'rb') as fd:
+                    storage.save(storage_path, fd)
 
 
 class Syncer(SettingsOverrideObject):

readthedocs/projects/tasks.py

@@ -20,7 +20,7 @@
 import requests
 from celery.exceptions import SoftTimeLimitExceeded
 from django.conf import settings
-from django.core.files.storage import get_storage_class, FileSystemStorage
+from django.core.files.storage import get_storage_class
 from django.db.models import Q
 from django.urls import reverse
 from django.utils import timezone
@@ -727,7 +727,7 @@ def update_app_instances(
             )
         hostname = socket.gethostname()
 
-        if not isinstance(storage, FileSystemStorage):
+        if getattr(storage, 'write_build_media', False):
             # Handle the case where we want to upload some built assets to our storage
             move_files.delay(
                 self.version.pk,