Implement some new methods on the storage engines.

data/database.py

@@ -11,6 +11,7 @@ from random import SystemRandom
 from datetime import datetime
 from peewee import *
 from data.read_slave import ReadSlaveModel
+from data.fields import ResumableSHAField, JSONField
 from sqlalchemy.engine.url import make_url
 from collections import defaultdict
 
@@ -750,35 +751,13 @@ class RepositoryAuthorizedEmail(BaseModel):
     )
 
 
-class ResumableSHAField(TextField):
-  def db_value(self, value):
-    sha_state = value.state()
-
-    # One of the fields is a byte string, let's base64 encode it to make sure
-    # we can store and fetch it regardless of default collocation
-    sha_state[3] = base64.b64encode(sha_state[3])
-
-    return json.dumps(sha_state)
-
-  def python_value(self, value):
-    to_resume = resumablehashlib.sha256()
-    if value is None:
-      return to_resume
-
-    sha_state = json.loads(value)
-
-    # We need to base64 decode the data bytestring
-    sha_state[3] = base64.b64decode(sha_state[3])
-    to_resume.set_state(sha_state)
-    return to_resume
-
-
 class BlobUpload(BaseModel):
   repository = ForeignKeyField(Repository, index=True)
   uuid = CharField(index=True, unique=True)
   byte_count = IntegerField(default=0)
   sha_state = ResumableSHAField(null=True, default=resumablehashlib.sha256)
   location = ForeignKeyField(ImageStorageLocation)
+  storage_metadata = JSONField(null=True, default={})
 
   class Meta:
     database = db