heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the the slug as the UUID instead of a newly generated UUID

Browse Source
This commit is contained in:
xray7224 2013-09-02 16:22:24 +01:00 committed by Jessica Tallon
parent 5b014a0866
commit d461fbe5cb
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mediagoblin/db/models.py
View File

@ -236,11 +236,6 @@ class NonceTimestamp(Base):
nonce = Column(Unicode, nullable=False, primary_key=True) nonce = Column(Unicode, nullable=False, primary_key=True)
timestamp = Column(DateTime, nullable=False, primary_key=True) timestamp = Column(DateTime, nullable=False, primary_key=True)
def create_uuid():
""" Creates a new uuid which is suitable for use in a URL """
return base64.urlsafe_b64encode(uuid.uuid4().bytes).strip("=")
class MediaEntry(Base, MediaEntryMixin): class MediaEntry(Base, MediaEntryMixin):
""" """
TODO: Consider fetching the media_files using join TODO: Consider fetching the media_files using join
@ -445,7 +440,7 @@ class MediaEntry(Base, MediaEntryMixin):
id = request.urlgen( id = request.urlgen(
"mediagoblin.federation.object", "mediagoblin.federation.object",
objectType=self.objectType, objectType=self.objectType,
uuid=self.uuid, uuid=self.slug,
qualified=True qualified=True
) )

2
mediagoblin/federation/views.py
View File

@ -49,7 +49,7 @@ def object(request):
# not sure why this is 404, maybe ask evan. Maybe 400? # not sure why this is 404, maybe ask evan. Maybe 400?
return json_response({"error": error}, status=404) return json_response({"error": error}, status=404)
media = MediaEntry.query.filter_by(uuid=uuid).first() media = MediaEntry.query.filter_by(slug=uuid).first()
if media is None: if media is None:
# no media found with that uuid # no media found with that uuid
error = "Can't find a {0} with ID = {1}".format(objectType, uuid) error = "Can't find a {0} with ID = {1}".format(objectType, uuid)