Skip to content

Allow for UTF chars in the file name without breaking the backend #2346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
christianlupus merged 2 commits into from
May 31, 2024
Merged

Allow for UTF chars in the file name without breaking the backend #2346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ae75eb
Allow for UTF chars in the file name without breaking the backend
christianlupus May 31, 2024
bd79465
Update Changelog
christianlupus May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/current/2346-utf-file-names-allow-abbreviation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Fixed

- Fix abbreviation of long file names even with UTF chars
7 changes: 5 additions & 2 deletions lib/Helper/FileSystem/RecipeNameHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ class RecipeNameHelper {
/** @var LoggerInterface */
private $logger;

/** @var int */
protected const MAX_LEN = 100;

public function __construct(
IL10N $l,
LoggerInterface $logger
Expand All @@ -35,8 +38,8 @@ public function getFolderName(string $recipeName): string {
$pattern = '/[\\/:?!"\\\\\'|&^#]/';
$recipeName = preg_replace($pattern, '_', $recipeName);

if (strlen($recipeName) > 100) {
$recipeName = substr($recipeName, 0, 97) . '___';
if (mb_strlen($recipeName) > self::MAX_LEN) {
$recipeName = mb_substr($recipeName, 0, self::MAX_LEN - 3) . '___';
}

return $recipeName;
Expand Down
3 changes: 2 additions & 1 deletion tests/Unit/Helper/FileSystem/RecipeNameHelperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use PHPUnit\Framework\TestCase;
use Psr\Log\LoggerInterface;

class RecipeNameHelperFilter extends TestCase {
class RecipeNameHelperTest extends TestCase {
/** @var RecipeNameHelper */
private $dut;

Expand All @@ -34,6 +34,7 @@ public function dpGetFolderName() {
'102 chars' => ["{$ninetyChars}123456789012", "{$ninetyChars}1234567___"],
'105 chars' => ["{$ninetyChars}123456789012345", "{$ninetyChars}1234567___"],
'special chars' => ['a/b:c?d!e"f|g\\h\'i^j&k#l', 'a_b_c_d_e_f_g_h_i_j_k_l'],
'greek chars' => ["Τραγανή granola χωρίς ζάχαρη με ό,τι ξηρούς καρπούς & αποξηραμένα φρούτα έχεις στο ντουλάπι σου", "Τραγανή granola χωρίς ζάχαρη με ό,τι ξηρούς καρπούς _ αποξηραμένα φρούτα έχεις στο ντουλάπι σου"],
];
}

Expand Down