Merge pull request #42 from antonagestam/fix-missing-etag

bugfix + version bump

.gitignore

@@ -1,2 +1,4 @@
 *.pyc
 .coverage
+.DS_Store
+.coveragerc.swp

collectfast/management/commands/collectstatic.py

@@ -112,14 +112,16 @@ def copy_file(self, path, prefixed_path, source_storage):
                 storage_lookup = self.get_lookup(normalized_path)
                 local_etag = self.get_file_hash(source_storage, path)
 
-                # Compare checksums and skip copying if matching
-                if storage_lookup.etag == local_etag:
-                    self.log("Skipping '%s' based on matching ETags" % path,
-                             level=2)
+                # Compare hashes and skip copying if matching
+                if (hasattr(storage_lookup, 'etag') and
+                        storage_lookup.etag == local_etag):
+                    self.log(
+                        "Skipping '%s' based on matching file hashes" % path,
+                        level=2)
                     self.num_skipped_files += 1
                     return False
                 else:
-                    self.log("ETag didn't match", level=2)
+                    self.log("Hashes did not match", level=2)
             except Exception as e:
                 # Ignore errors and let super Command handle it
                 self.stdout.write(smart_str(

setup.py

@@ -5,8 +5,8 @@
 
 setup(
     name='Collectfast',
-    version='0.1.14',
     description='Collectstatic on Steroids',
+    version='0.2.0',
     long_description=open('README.md').read(),
     author='Anton Agestam',
     author_email='[email protected]',