Merge pull request #328 from TaYaKi71751/dev-git-toast

Add showToast in exportbookmarkgit
project-violet · Jan 10, 2024 · f4020e0 · f4020e0
2 parents 2e94523 + 6df6491
commit f4020e0
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 9 deletions.
diff --git a/assets/locale/en.json b/assets/locale/en.json
@@ -153,6 +153,7 @@
   "importingbookmark": "Import Bookmark",
   "exportingbookmark": "Export Bookmark",
   "exportingbookmarkgit": "Export Bookmark to Git Repository",
+  "failexportbookmark": "Failed to export bookmark",
   "noauth": "You do not have permission to run it.",
   "noselectedb": "No database selected.",
   "importbookmark": "Bookmark Imported!",

diff --git a/assets/locale/eo.json b/assets/locale/eo.json
@@ -153,6 +153,7 @@
   "importingbookmark": "Importar Marcador",
   "exportingbookmark": "Exportar Marcador",
   "exportingbookmarkgit": "Export Bookmark to Git Repository",
+  "failexportbookmark": "Failed to export bookmark",
   "noauth": "No tienes permiso para iniciar.",
   "noselectedb": "No se ha seleccionado ninguna base de datos.",
   "importbookmark": "¡Marcador Importado!",

diff --git a/assets/locale/it.json b/assets/locale/it.json
@@ -153,6 +153,7 @@
   "importingbookmark": "Importa Segnalibri",
   "exportingbookmark": "Esporta Segnalibri",
   "exportingbookmarkgit": "Export Bookmark to Git Repository",
+  "failexportbookmark": "Failed to export bookmark",
   "noauth": "Non hai il permesso di avviarlo.",
   "noselectedb": "Nessun database selezionato.",
   "importbookmark": "Segnalibri Importati!",

diff --git a/assets/locale/ja.json b/assets/locale/ja.json
@@ -153,6 +153,7 @@
   "importingbookmark": "ブックマークを読み込む",
   "exportingbookmark": "ブックマークの書き出す",
   "exportingbookmarkgit": "Export Bookmark to Git Repository",
+  "failexportbookmark": "Failed to export bookmark",
   "noauth": "権限がないため、実行できません。",
   "noselectedb": "選択されたデータベースがありません。",
   "importbookmark": "ブックマークを読み込みしました！",

diff --git a/assets/locale/ko.json b/assets/locale/ko.json
@@ -153,6 +153,7 @@
   "importingbookmark": "북마크 가져오기",
   "exportingbookmark": "북마크 내보내기",
   "exportingbookmarkgit": "Export Bookmark to Git Repository",
+  "failexportbookmark": "Failed to export bookmark",
   "noauth": "권한이 없어서 실행할 수 없습니다.",
   "noselectedb": "선택된 데이터베이스가 없습니다.",
   "importbookmark": "북마크를 가져왔습니다!",

diff --git a/assets/locale/pt.json b/assets/locale/pt.json
@@ -153,6 +153,7 @@
   "importingbookmark": "Importar marcador",
   "exportingbookmark": "Exportar marcador",
   "exportingbookmarkgit": "Export Bookmark to Git Repository",
+  "failexportbookmark": "Failed to export bookmark",
   "noauth": "Você não tem permissão para executar isso.",
   "noselectedb": "Nenhum banco de dados selecionado.",
   "importbookmark": "Marcador importado!",

diff --git a/assets/locale/zh.json b/assets/locale/zh.json
@@ -153,6 +153,7 @@
   "importingbookmark": "Import Bookmark",
   "exportingbookmark": "Export Bookmark",
   "exportingbookmarkgit": "Export Bookmark to Git Repository",
+  "failexportbookmark": "Failed to export bookmark",
   "noauth": "You do not have permission to run it.",
   "noselectedb": "No database selected.",
   "importbookmark": "Bookmark Imported!",

diff --git a/assets/locale/zh_Hans.json b/assets/locale/zh_Hans.json
@@ -153,6 +153,7 @@
   "importingbookmark": "导入书签",
   "exportingbookmark": "导出书签",
   "exportingbookmarkgit": "Export Bookmark to Git Repository",
+  "failexportbookmark": "Failed to export bookmark",
   "noauth": "你没有权限执行此操作.",
   "noselectedb": "没有数据库被选中.",
   "importbookmark": "书签导入成功!",

diff --git a/assets/locale/zh_Hant.json b/assets/locale/zh_Hant.json
@@ -153,6 +153,7 @@
   "importingbookmark": "Import Bookmark",
   "exportingbookmark": "Export Bookmark",
   "exportingbookmarkgit": "Export Bookmark to Git Repository",
+  "failexportbookmark": "Failed to export bookmark",
   "noauth": "You do not have permission to run it.",
   "noselectedb": "No database selected.",
   "importbookmark": "Bookmark Imported!",

diff --git a/lib/pages/settings/settings_page.dart b/lib/pages/settings/settings_page.dart
@@ -2022,17 +2022,45 @@ class _SettingsPageState extends State<SettingsPage>
               if (await Directory(gitPath).exists()) {
                 await Directory(gitPath).delete(recursive: true);
               }
-
-              final git = BookmarkGit();
-              await git.clone(gitPath);
-              final extpath = '$gitPath/bookmark.db';
-              await bookmarkDatabaseFile.copy(extpath);
-              await git.addAll(gitPath);
-              await git.commit(gitPath);
-              await git.push(gitPath);
+              try {
+                final git = BookmarkGit();
+                await git.clone(gitPath);
+                final extpath = '$gitPath/bookmark.db';
+                await bookmarkDatabaseFile.copy(extpath);
+                await git.addAll(gitPath);
+                await git.commit(gitPath);
+                await git.push(gitPath);
+              } catch (e, st) {
+                Logger.error('[exportingbookmarkgit] $e\n'
+                    '$st');
+                flutterToast.showToast(
+                  child: ToastWrapper(
+                    isCheck: true,
+                    isWarning: false,
+                    msg: Translations.of(context).trans('failexportbookmark'),
+                  ),
+                  ignorePointer: true,
+                  gravity: ToastGravity.BOTTOM,
+                  toastDuration: const Duration(seconds: 4),
+                );
+                if (await Directory(gitPath).exists()) {
+                  await Directory(gitPath).delete(recursive: true);
+                }
+                return;
+              }
               if (await Directory(gitPath).exists()) {
                 await Directory(gitPath).delete(recursive: true);
               }
+              flutterToast.showToast(
+                child: ToastWrapper(
+                  isCheck: true,
+                  isWarning: false,
+                  msg: Translations.of(context).trans('exportbookmark'),
+                ),
+                ignorePointer: true,
+                gravity: ToastGravity.BOTTOM,
+                toastDuration: const Duration(seconds: 4),
+              );
             },
           ),
           InkWell(
@@ -2105,7 +2133,7 @@ class _SettingsPageState extends State<SettingsPage>
                           element.description() == description &&
                           // element.color() == color.value &&
                           DateTime.tryParse(element.datetime()) == datetime))
-                      .first
+                      .last
                       .id();
                   for (int j = 0;
                       j <