refactor: remove legacy 'Mi Carpeta' references, use 'My Folder' only
This commit is contained in:
@@ -19,15 +19,10 @@ const WRITE_BEHIND_THRESHOLD: usize = 256 * 1024;
|
||||
|
||||
/// Helper function to extract username from folder path string
|
||||
fn extract_username_from_path(path: &str) -> Option<String> {
|
||||
// Support both new ("My Folder - ") and legacy ("Mi Carpeta - ") prefixes
|
||||
let prefix = if path.contains("My Folder - ") {
|
||||
"My Folder - "
|
||||
} else if path.contains("Mi Carpeta - ") {
|
||||
"Mi Carpeta - "
|
||||
} else {
|
||||
if !path.contains("My Folder - ") {
|
||||
return None;
|
||||
};
|
||||
let parts: Vec<&str> = path.split(prefix).collect();
|
||||
}
|
||||
let parts: Vec<&str> = path.split("My Folder - ").collect();
|
||||
if parts.len() <= 1 {
|
||||
return None;
|
||||
}
|
||||
|
||||
@@ -57,17 +57,16 @@ impl StorageUsageService {
|
||||
let all_folders = self.file_repository.list_files(None).await
|
||||
.map_err(|e| DomainError::internal_error("File repository", e.to_string()))?;
|
||||
|
||||
// Find the user's home folder (named "My Folder - {username}" or legacy "Mi Carpeta - {username}")
|
||||
// Find the user's home folder (named "My Folder - {username}")
|
||||
let home_folder_name = format!("My Folder - {}", username);
|
||||
let legacy_folder_name = format!("Mi Carpeta - {}", username);
|
||||
debug!("Looking for home folder: {} or {}", home_folder_name, legacy_folder_name);
|
||||
debug!("Looking for home folder: {}", home_folder_name);
|
||||
|
||||
let mut total_usage: i64 = 0;
|
||||
let mut home_folder_id = None;
|
||||
|
||||
// Find the home folder ID (check both new and legacy names)
|
||||
// Find the home folder ID
|
||||
for folder in &all_folders {
|
||||
if folder.name() == home_folder_name || folder.name() == legacy_folder_name {
|
||||
if folder.name() == home_folder_name {
|
||||
home_folder_id = Some(folder.id().to_string());
|
||||
debug!("Found home folder for user {}: ID={}", username, folder.id());
|
||||
break;
|
||||
|
||||
+2
-2
@@ -752,7 +752,7 @@ async function loadFiles(options = {}) {
|
||||
}
|
||||
|
||||
// Skip other users' folders when at root
|
||||
if (!app.currentPath && folder.name.startsWith('Mi Carpeta - ') && !folder.name.includes(username)) {
|
||||
if (!app.currentPath && folder.name.startsWith('My Folder - ') && !folder.name.includes(username)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1709,7 +1709,7 @@ async function findUserHomeFolder(username) {
|
||||
// This prevents loops when the folder can't be found
|
||||
const defaultFolder = {
|
||||
id: 'default-folder',
|
||||
name: `Mi Carpeta - ${username}`,
|
||||
name: `My Folder - ${username}`,
|
||||
parent_id: null,
|
||||
created_at: Date.now() / 1000,
|
||||
updated_at: Date.now() / 1000
|
||||
|
||||
+4
-4
@@ -124,11 +124,11 @@ const Modal = {
|
||||
const t = window.i18n ? window.i18n.t.bind(window.i18n) : (k) => k;
|
||||
|
||||
return this.prompt({
|
||||
title: t('dialogs.new_folder_title') || 'Nueva carpeta',
|
||||
label: t('dialogs.folder_name') || 'Nombre de la carpeta',
|
||||
placeholder: t('dialogs.folder_placeholder') || 'Mi carpeta',
|
||||
title: t('dialogs.new_folder_title') || 'New folder',
|
||||
label: t('dialogs.folder_name') || 'Folder name',
|
||||
placeholder: t('dialogs.folder_placeholder') || 'My folder',
|
||||
icon: 'fa-folder-plus',
|
||||
confirmText: t('actions.create') || 'Crear'
|
||||
confirmText: t('actions.create') || 'Create'
|
||||
});
|
||||
},
|
||||
|
||||
|
||||
Reference in New Issue
Block a user