Skip to content

Commit 5a929ed

Browse files
committed
fix: Rename create_serving_url into inject_serving_url (viur-framework#1241)
1 parent 88f8498 commit 5a929ed

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

src/viur/core/modules/file.py

+6-10
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ def refresh(cls, skelValues):
405405
skelValues["downloadUrl"] = importData
406406
skelValues["pendingparententry"] = False
407407

408-
conf.main_app.file.create_serving_url(skelValues)
408+
conf.main_app.file.inject_serving_url(skelValues)
409409

410410

411411
class FileNodeSkel(TreeSkel):
@@ -508,7 +508,7 @@ def create_internal_serving_url(
508508
This is needed to hide requests to Google as they are internally be routed, and can be the result of a
509509
legal requirement like GDPR.
510510
511-
:param serving_url: Is the original serving URL as generated from create_serving_url()
511+
:param serving_url: Is the original serving URL as generated from inject_serving_url()
512512
:param size: Optional size setting
513513
:param filename: Optonal filename setting
514514
:param options: Additional options parameter-pass through to /file/serve
@@ -1139,8 +1139,7 @@ def add(self, skelType: SkelType, node: db.Key | int | str | None = None, *args,
11391139
skel["weak"] = rootNode is None
11401140
skel["crc32c_checksum"] = base64.b64decode(blob.crc32c).hex()
11411141
skel["md5_checksum"] = base64.b64decode(blob.md5_hash).hex()
1142-
1143-
skel = self.create_serving_url(skel)
1142+
self.inject_serving_url(skel)
11441143

11451144
skel.toDB()
11461145

@@ -1172,7 +1171,7 @@ def onEdit(self, skelType: SkelType, skel: SkeletonInstance):
11721171
bucket.copy_blob(old_blob, bucket, new_path, if_generation_match=0)
11731172
bucket.delete_blob(old_path)
11741173

1175-
self.create_serving_url(skel)
1174+
self.inject_serving_url(skel)
11761175

11771176
def mark_for_deletion(self, dlkey: str) -> None:
11781177
"""
@@ -1196,9 +1195,8 @@ def mark_for_deletion(self, dlkey: str) -> None:
11961195

11971196
db.Put(fileObj)
11981197

1199-
def create_serving_url(self, skel: SkeletonInstance) -> SkeletonInstance:
1200-
""" Create Serving url for public image files
1201-
"""
1198+
def inject_serving_url(self, skel: SkeletonInstance) -> None:
1199+
"""Inject the serving url for public image files into a FileSkel"""
12021200
# try to create a servingurl for images
12031201
if not conf.instance.is_dev_server and skel["public"] and skel["mimetype"] \
12041202
and skel["mimetype"].startswith("image/") and not skel["serving_url"]:
@@ -1214,8 +1212,6 @@ def create_serving_url(self, skel: SkeletonInstance) -> SkeletonInstance:
12141212
logging.warning("Error while creating serving url")
12151213
logging.exception(e)
12161214

1217-
return skel
1218-
12191215

12201216
@PeriodicTask(interval=datetime.timedelta(hours=4))
12211217
def startCheckForUnreferencedBlobs():

0 commit comments

Comments
 (0)