Merge pull request #27 from Vysp3r/21-vimms-lair-parser-rework

Vimm's Lair parser rework
Vysp3r · Feb 17, 2024 · e94fd35 · e94fd35
2 parents 291fb9c + 15cd217
commit e94fd35
Show file tree

Hide file tree

Showing 10 changed files with 480 additions and 890 deletions.
diff --git a/po/com.vysp3r.RetroPlus.pot b/po/com.vysp3r.RetroPlus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: com.vysp3r.RetroPlus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-12 04:02+0300\n"
+"POT-Creation-Date: 2024-02-16 21:04-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -58,15 +58,14 @@ msgstr ""
 msgid "translator-credits"
 msgstr ""
 
-#: src/main-window.vala:33
+#: src/main-window.vala:34
 msgid "Preferences"
 msgstr ""
 
-#: src/main-window.vala:34
+#: src/main-window.vala:35
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#. Translators: Do not translate the application name
 #: src/main-window.vala:36
 msgid "About RetroPlus"
 msgstr ""
@@ -96,54 +95,59 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: src/main-window.vala:111
+#: src/main-window.vala:119
 msgid ""
 "Feels empty in here.\n"
 "Why not search for a game?"
 msgstr ""
 
-#: src/main-window.vala:187
+#: src/main-window.vala:215
 msgid ""
 "Can't reach the servers.\n"
 "Please report this on our GitHub if you think this is a bug."
 msgstr ""
 
-#: src/main-window.vala:192
+#: src/main-window.vala:220
 msgid ""
 "An unknown error occurred.\n"
 "Please report this on our GitHub."
 msgstr ""
 
-#: src/main-window.vala:197
+#: src/main-window.vala:225
 msgid "Nothing found, try searching again."
 msgstr ""
 
-#: src/main-window.vala:270
+#: src/main-window.vala:291
 #, c-format
 msgid "An error occured while opening %s"
 msgstr ""
 
-#: src/main-window.vala:296
+#: src/main-window.vala:309
+#, c-format
+msgid "%s is currently missing/unavailable"
+msgstr ""
+
+#: src/main-window.vala:324
 #, c-format
 msgid "%s download queued"
 msgstr ""
 
-#: src/main-window.vala:302
+#: src/main-window.vala:329
 #, c-format
 msgid "%s finished downloading"
 msgstr ""
 
-#: src/main-window.vala:308
+#: src/main-window.vala:334
 #, c-format
 msgid "%s download cancelled"
 msgstr ""
 
-#: src/main-window.vala:314
+#: src/main-window.vala:339
 #, c-format
 msgid "%s could not download due to an error"
 msgstr ""
 
-#: src/main-window.vala:320
+#: src/main-window.vala:344
 #, c-format
 msgid "%s is already downloaded"
 msgstr ""
@@ -230,17 +234,17 @@ msgid "See manual"
 msgstr ""
 
 #: src/widgets/game-detail-dialog.vala:198
-#: src/widgets/game-detail-dialog.vala:228
+#: src/widgets/game-detail-dialog.vala:231
 msgid "CRC"
 msgstr ""
 
 #: src/widgets/game-detail-dialog.vala:199
-#: src/widgets/game-detail-dialog.vala:231
+#: src/widgets/game-detail-dialog.vala:234
 msgid "MD5"
 msgstr ""
 
 #: src/widgets/game-detail-dialog.vala:200
-#: src/widgets/game-detail-dialog.vala:235
+#: src/widgets/game-detail-dialog.vala:238
 msgid "SHA1"
 msgstr ""
 
@@ -268,10 +272,14 @@ msgstr ""
 msgid "vote"
 msgstr ""
 
+#: src/widgets/game-detail-dialog.vala:228
+msgid "Verified"
+msgstr ""
+
 #: src/widgets/search-filter-box.vala:31
 msgid "Source"
 msgstr ""
 
-#: src/widgets/search-row.vala:40
+#: src/widgets/search-row.vala:27
 msgid "Manual available"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: com.vysp3r.RetroPlus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-12 04:02+0300\n"
+"POT-Creation-Date: 2024-02-16 21:04-0500\n"
 "PO-Revision-Date: 2024-02-12 04:02+0300\n"
 "Last-Translator: Sabri Ünal <libreajans@gmail.com>\n"
 "Language-Team: \n"
@@ -62,15 +62,14 @@ msgstr "Özel teşekkürler"
 msgid "translator-credits"
 msgstr "Sabri Ünal <libreajans@gmail.com>"
 
-#: src/main-window.vala:33
+#: src/main-window.vala:34
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: src/main-window.vala:34
+#: src/main-window.vala:35
 msgid "Keyboard Shortcuts"
 msgstr "Klavye Kısayolları"
 
-#. Translators: Do not translate the application name
 #: src/main-window.vala:36
 msgid "About RetroPlus"
 msgstr "RetroPlus Hakkında"
@@ -100,60 +99,65 @@ msgstr "Bölge"
 msgid "Version"
 msgstr "Sürüm"
 
-#: src/main-window.vala:111
+#: src/main-window.vala:119
 msgid ""
 "Feels empty in here.\n"
 "Why not search for a game?"
 msgstr ""
 "Burası boş gibi.\n"
 "Neden bir oyun aramıyorsunuz?"
 
-#: src/main-window.vala:187
+#: src/main-window.vala:215
 msgid ""
 "Can't reach the servers.\n"
 "Please report this on our GitHub if you think this is a bug."
 msgstr ""
 "Sunuculara ulaşılamıyor.\n"
 "Bunun bir hata olduğunu düşünüyorsanız lütfen GitHub üstünden bildirin."
 
-#: src/main-window.vala:192
+#: src/main-window.vala:220
 msgid ""
 "An unknown error occurred.\n"
 "Please report this on our GitHub."
 msgstr ""
 "Bilinmeyen bir hata oluştu.\n"
 "Lütfen bunu GitHub üstünden bildirin."
 
-#: src/main-window.vala:197
+#: src/main-window.vala:225
 msgid "Nothing found, try searching again."
 msgstr "Hiçbir şey bulunamadı, tekrar aramayı deneyin."
 
-#: src/main-window.vala:270
+#: src/main-window.vala:291
 #, c-format
 msgid "An error occured while opening %s"
 msgstr "%s açılırken hata oluştu"
 
-#: src/main-window.vala:296
+#: src/main-window.vala:309
+#, c-format
+msgid "%s is currently missing/unavailable"
+msgstr ""
+
+#: src/main-window.vala:324
 #, c-format
 msgid "%s download queued"
 msgstr "%s indirme sırasına eklendi"
 
-#: src/main-window.vala:302
+#: src/main-window.vala:329
 #, c-format
 msgid "%s finished downloading"
 msgstr "%s indirildi"
 
-#: src/main-window.vala:308
+#: src/main-window.vala:334
 #, c-format
 msgid "%s download cancelled"
 msgstr "%s indirmesi iptal edildi"
 
-#: src/main-window.vala:314
+#: src/main-window.vala:339
 #, c-format
 msgid "%s could not download due to an error"
 msgstr "%s hata nedeniyle indirilemedi"
 
-#: src/main-window.vala:320
+#: src/main-window.vala:344
 #, c-format
 msgid "%s is already downloaded"
 msgstr "%s zaten indirilmiş"
@@ -240,17 +244,17 @@ msgid "See manual"
 msgstr "Kılavuza bak"
 
 #: src/widgets/game-detail-dialog.vala:198
-#: src/widgets/game-detail-dialog.vala:228
+#: src/widgets/game-detail-dialog.vala:231
 msgid "CRC"
 msgstr "CRC"
 
 #: src/widgets/game-detail-dialog.vala:199
-#: src/widgets/game-detail-dialog.vala:231
+#: src/widgets/game-detail-dialog.vala:234
 msgid "MD5"
 msgstr "MD5"
 
 #: src/widgets/game-detail-dialog.vala:200
-#: src/widgets/game-detail-dialog.vala:235
+#: src/widgets/game-detail-dialog.vala:238
 msgid "SHA1"
 msgstr "SHA1"
 
@@ -278,11 +282,15 @@ msgstr "oy"
 msgid "vote"
 msgstr "oy"
 
+#: src/widgets/game-detail-dialog.vala:228
+msgid "Verified"
+msgstr ""
+
 #: src/widgets/search-filter-box.vala:31
 msgid "Source"
 msgstr "Kaynak"
 
-#: src/widgets/search-row.vala:40
+#: src/widgets/search-row.vala:27
 msgid "Manual available"
 msgstr "Kılavuz var"
 

diff --git a/src/main-window.vala b/src/main-window.vala
@@ -305,6 +305,13 @@ namespace RetroPlus {
         }
 
         void on_download_started (Models.Game game, Models.Media media) {
+            if (game.missing || game.removed) {
+                var toast = new Adw.Toast (_("%s is currently missing/unavailable").printf (game.title));
+                toast_overlay.add_toast (toast);
+
+                return;
+            }
+
             var system = Application.systems.get (game.system);
 
             if (system == null) {
@@ -315,31 +322,26 @@ namespace RetroPlus {
             download_popover.add_download (game, media, system);
 
             var toast = new Adw.Toast (_("%s download queued").printf (game.title));
-
             toast_overlay.add_toast (toast);
         }
 
         void on_download_finished (Models.Game game) {
             var toast = new Adw.Toast (_("%s finished downloading").printf (game.title));
-
             toast_overlay.add_toast (toast);
         }
 
         void on_download_cancelled (Models.Game game) {
             var toast = new Adw.Toast (_("%s download cancelled").printf (game.title));
-
             toast_overlay.add_toast (toast);
         }
 
         void on_download_error (Models.Game game) {
             var toast = new Adw.Toast (_("%s could not download due to an error").printf (game.title));
-
             toast_overlay.add_toast (toast);
         }
 
         void on_download_file_exists (Models.Game game) {
             var toast = new Adw.Toast (_("%s is already downloaded").printf (game.title));
-
             toast_overlay.add_toast (toast);
         }
     }

diff --git a/src/meson.build b/src/meson.build
@@ -24,7 +24,8 @@ sources = [
 
   'utils/web.vala',
   'utils/filesystem.vala',
-  'utils/parser.vala',
+
+  'utils/parsers/vimms-lair-parser.vala',
 
   'models/game.vala',
   'models/system.vala',
@@ -46,6 +47,7 @@ deps = [
   dependency('libsoup-3.0'),
   dependency('json-glib-1.0'),
   dependency('gee-0.8'),
+  dependency('libxml-2.0')
 ]
 
 executable(

diff --git a/src/models/game.vala b/src/models/game.vala
@@ -5,6 +5,7 @@ namespace RetroPlus.Models {
         public string system { get; set; }
         public List<Region> regions;
         public int max_players { get; set; }
+        public bool removed { get; set; }
         public bool has_max_players {
             get {
                 return max_players > 0;
@@ -119,7 +120,7 @@ namespace RetroPlus.Models {
 
                 var game = this;
 
-                if (!Utils.Parser.parse_game_request (res, ref game)) {
+                if (!Utils.VimmsLairParser.parse_game_request (res, ref game)) {
                     return output = false;
                 }