Refactor 008: Error Handling

.gitignore

@@ -0,0 +1,2 @@
+.vscode/**
+

makefile

@@ -0,0 +1,5 @@
+rebase:
+	git rebase -i dev
+
+push:
+	git push --set-upstream origin @

violet/lib/component/hitomi/hitomi.dart

@@ -322,15 +322,17 @@ class QueryTranslator {
       where += parseParentheses(token, negative);
       where += parseExpression();
       where += nextToken();
+      if (hasMoreTokens()) {
+        where += parseLogicalExpression();
+      }
     } else if (token == ')') {
       return token;
     } else {
       where += parseTitle(token, negative);
     }
 
     if (hasMoreTokens() && lookAhead() != ')') {
-      String logicalOp = parseLogicalOperator();
-      where += logicalOp + parseExpression();
+      where += parseLogicalExpression();
     }
 
     return where;
@@ -393,18 +395,21 @@ class QueryTranslator {
     return negative ? "Title NOT LIKE '%$token%'" : "Title LIKE '%$token%'";
   }
 
-  String parseLogicalOperator() {
+  String parseLogicalExpression() {
     String next = lookAhead();
+    late String op;
     if (next.toLowerCase() == 'or') {
       nextToken();
-      return ' OR ';
+      op = 'OR';
+    } else {
+      op = 'AND';
     }
-    return ' AND ';
+    return ' $op ${parseExpression()}';
   }
 
   String nextToken() => tokens[index++];
   String lookAhead() => index < tokens.length ? tokens[index] : '';
-  bool hasMoreTokens() => index < tokens.length - 1;
+  bool hasMoreTokens() => index < tokens.length;
 
   static String findColumnByTag(String tag) {
     switch (tag) {

violet/lib/pages/settings/settings_page.dart

@@ -647,14 +647,14 @@ class _SettingsPageState extends State<SettingsPage>
             title: Text(Translations.instance!.trans('excludetag')),
             trailing: const Icon(Icons.keyboard_arrow_right),
             onTap: () async {
-              final vv = await showDialog(
+              final vv = await showDialog<(int, String)?>(
                 context: context,
                 builder: (BuildContext context) =>
                     const TagSelectorDialog(what: 'exclude'),
               );
 
-              if (vv.$1 == 1) {
-                Settings.setExcludeTags(vv.$2);
+              if (vv?.$1 == 1) {
+                Settings.setExcludeTags(vv!.$2);
                 setState(() {
                   _shouldReload = true;
                 });

violet/lib/pages/viewer/horizontal_viewer_page.dart

@@ -90,12 +90,13 @@ class _HorizontalViewerPageState extends State<HorizontalViewerPage> {
     return Obx(
       () => Stack(
         children: [
-          Visibility.maintain(
-            child: OrientationBuilder(builder: (context, orientation) {
-              c.jump(c.page.value);
-              return const SizedBox.shrink();
-            }),
-          ),
+          // TODO: 없어도 될 것 같은데 뭐지
+          // Visibility.maintain(
+          //   child: OrientationBuilder(builder: (context, orientation) {
+          //     c.jump(c.page.value);
+          //     return const SizedBox.shrink();
+          //   }),
+          // ),
           Container(
             decoration: const BoxDecoration(
               color: Colors.black,

violet/lib/pages/viewer/image/file_image.dart

@@ -203,7 +203,7 @@ class ImageCropBookmark extends StatelessWidget {
           '$articleId(${page}p): [${area.toString().split('(')[1].split(')')[0]}] Saved!',
     );
 
-    if (!context.mounted) return;
+    // ignore: use_build_context_synchronously
     Navigator.pop(context);
   }
 }

violet/lib/pages/viewer/image/provider_image.dart

@@ -229,7 +229,7 @@ class ImageCropBookmark extends StatelessWidget {
           '$articleId(${page}p): [${area.toString().split('(')[1].split(')')[0]}] Saved!',
     );
 
-    if (!context.mounted) return;
+    // ignore: use_build_context_synchronously
     Navigator.pop(context);
   }
 }

violet/makefile

@@ -0,0 +1 @@
+../makefile

violet/test/query_test.dart

@@ -55,7 +55,7 @@ void main() {
       expect(result1,
           'SELECT * FROM HitomiColumnModel WHERE Tags LIKE \'%|female:sole female|%\' AND NOT (Tags LIKE \'%|female:mother|%\' AND Tags LIKE \'%|female:milf|%\')  AND ExistOnHitomi=1');
       expect(result2,
-          'SELECT * FROM HitomiColumnModel WHERE (Language LIKE \'%korean%\' OR Language LIKE \'%n/a%\')  AND ExistOnHitomi=1');
+          'SELECT * FROM HitomiColumnModel WHERE (Language LIKE \'%korean%\' OR Language LIKE \'%n/a%\') AND (Tags LIKE \'%|female:sole female|%\') IS NOT 1  AND ExistOnHitomi=1');
     });
   });
 }