mirror of
https://github.com/suitenumerique/drive.git
synced 2026-08-17 20:15:40 +02:00
🩹(backend) add suffix to converted filename
The converted file was missing '(converted)' suffix.
This commit is contained in:
@@ -58,7 +58,7 @@ def test_convert_endpoint_creates_placeholder_and_queues_task():
|
||||
body = response.json()
|
||||
placeholder = models.Item.objects.get(id=body["id"])
|
||||
assert placeholder.upload_state == models.ItemUploadStateChoices.CONVERTING
|
||||
assert placeholder.filename == "document.docx"
|
||||
assert placeholder.filename == "document (converted).docx"
|
||||
assert placeholder.parent().id == item.parent().id
|
||||
delay_mock.assert_called_once_with(
|
||||
source_item_id=str(item.id),
|
||||
|
||||
@@ -445,6 +445,10 @@ msgstr "Deutsch"
|
||||
#~ msgid "Templates"
|
||||
#~ msgstr "Vorlagen"
|
||||
|
||||
#: wopi/conversion/services.py:86
|
||||
msgid "converted"
|
||||
msgstr "konvertiert"
|
||||
|
||||
#~ msgid "Template/user relation"
|
||||
#~ msgstr "Vorlage/Benutzer-Beziehung"
|
||||
|
||||
|
||||
@@ -360,3 +360,7 @@ msgstr ""
|
||||
#: drive/settings.py:252
|
||||
msgid "German"
|
||||
msgstr ""
|
||||
|
||||
#: wopi/conversion/services.py:86
|
||||
msgid "converted"
|
||||
msgstr ""
|
||||
|
||||
@@ -370,6 +370,10 @@ msgstr ""
|
||||
msgid "German"
|
||||
msgstr ""
|
||||
|
||||
#: wopi/conversion/services.py:86
|
||||
msgid "converted"
|
||||
msgstr "converti"
|
||||
|
||||
#~ msgid "A new item was created on your behalf!"
|
||||
#~ msgstr "Un nouveau item a été créé pour vous !"
|
||||
|
||||
|
||||
@@ -367,3 +367,7 @@ msgstr "Duits"
|
||||
#: drive/settings.py:253
|
||||
msgid "Dutch"
|
||||
msgstr "Nederlands"
|
||||
|
||||
#: wopi/conversion/services.py:86
|
||||
msgid "converted"
|
||||
msgstr "geconverteerd"
|
||||
|
||||
@@ -5,6 +5,7 @@ from os.path import splitext
|
||||
from django.conf import settings
|
||||
from django.core.files.storage import default_storage
|
||||
from django.db import DatabaseError, transaction
|
||||
from django.utils.translation import gettext as _
|
||||
|
||||
from core import models
|
||||
from core.api.utils import detect_mimetype
|
||||
@@ -81,8 +82,8 @@ def _target_filename(item, target_extension, parent, user):
|
||||
else:
|
||||
siblings = Item.objects.filter(path__depth=1, accesses__user=user).distinct()
|
||||
|
||||
base, _ = splitext(item.filename)
|
||||
target = f"{base}.{target_extension}"
|
||||
base, _extension = splitext(item.filename)
|
||||
target = f"{base} ({_('converted')}).{target_extension}"
|
||||
|
||||
return manage_unique_title(siblings, target)
|
||||
|
||||
|
||||
@@ -76,7 +76,7 @@ def test_convert_item_creates_converted_file_copy(settings):
|
||||
|
||||
converted = services.convert_item(item, user)
|
||||
|
||||
assert converted.filename == "document.docx"
|
||||
assert converted.filename == "document (converted).docx"
|
||||
assert converted.parent().id == parent.id
|
||||
assert converted.upload_state == models.ItemUploadStateChoices.READY
|
||||
|
||||
@@ -125,16 +125,16 @@ def test_convert_item_keeps_title_and_filename_aligned_on_collision(settings):
|
||||
factories.ItemFactory(
|
||||
parent=parent,
|
||||
type=models.ItemTypeChoices.FILE,
|
||||
title="document.docx",
|
||||
filename="document.docx",
|
||||
title="document (converted).docx",
|
||||
filename="document (converted).docx",
|
||||
update_upload_state=models.ItemUploadStateChoices.READY,
|
||||
)
|
||||
item = _file(user, parent=parent)
|
||||
|
||||
converted = services.convert_item(item, user)
|
||||
|
||||
assert converted.title == "document_01.docx"
|
||||
assert converted.filename == "document_01.docx"
|
||||
assert converted.title == "document (converted)_01.docx"
|
||||
assert converted.filename == "document (converted)_01.docx"
|
||||
|
||||
|
||||
def test_convert_item_uses_source_parent_when_user_can_update_it_via_link(settings):
|
||||
@@ -336,7 +336,7 @@ def test_prepare_conversion_returns_placeholder_in_converting_state(settings):
|
||||
|
||||
placeholder = services.prepare_conversion(item, user)
|
||||
|
||||
assert placeholder.filename == "document.docx"
|
||||
assert placeholder.filename == "document (converted).docx"
|
||||
assert placeholder.upload_state == models.ItemUploadStateChoices.CONVERTING
|
||||
assert placeholder.parent().id == parent.id
|
||||
|
||||
|
||||
Reference in New Issue
Block a user