From faa02c54fe6df1460fb41ecbfdf83abcab5df209 Mon Sep 17 00:00:00 2001 From: NaiJi Date: Sun, 3 Dec 2023 00:44:32 +0400 Subject: [PATCH 1/2] feat(backblaze): Include milliseconds since epoch to bucket name - Resolve https://git.selfprivacy.org/SelfPrivacy/selfprivacy.org.app/issues/263 --- lib/logic/cubit/backups/backups_cubit.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/logic/cubit/backups/backups_cubit.dart b/lib/logic/cubit/backups/backups_cubit.dart index ca7e0a50..33936f3a 100644 --- a/lib/logic/cubit/backups/backups_cubit.dart +++ b/lib/logic/cubit/backups/backups_cubit.dart @@ -63,8 +63,8 @@ class BackupsCubit extends ServerInstallationDependendCubit { .state.serverDomain!.domainName .replaceAll(RegExp(r'[^a-zA-Z0-9]'), '-'); final int serverId = serverInstallationCubit.state.serverDetails!.id; - String bucketName = 'selfprivacy-$domain-$serverId'; - // If bucket name is too long, shorten it + String bucketName = + '$domain-$serverId-${DateTime.now().millisecondsSinceEpoch}'; if (bucketName.length > 49) { bucketName = bucketName.substring(0, 49); } From f6ded5399c6ef960563e1fe4b4afe4ee4dbe6ce3 Mon Sep 17 00:00:00 2001 From: NaiJi Date: Sun, 3 Dec 2023 21:58:56 +0400 Subject: [PATCH 2/2] refactor(backblaze): Move milliseconds since epoch to the beginning of bucket name --- lib/logic/cubit/backups/backups_cubit.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/logic/cubit/backups/backups_cubit.dart b/lib/logic/cubit/backups/backups_cubit.dart index 33936f3a..0c3bd893 100644 --- a/lib/logic/cubit/backups/backups_cubit.dart +++ b/lib/logic/cubit/backups/backups_cubit.dart @@ -64,7 +64,7 @@ class BackupsCubit extends ServerInstallationDependendCubit { .replaceAll(RegExp(r'[^a-zA-Z0-9]'), '-'); final int serverId = serverInstallationCubit.state.serverDetails!.id; String bucketName = - '$domain-$serverId-${DateTime.now().millisecondsSinceEpoch}'; + '${DateTime.now().millisecondsSinceEpoch}-$serverId-$domain'; if (bucketName.length > 49) { bucketName = bucketName.substring(0, 49); }