Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement Dolphin Importer #154

Draft
wants to merge 41 commits into
base: dolphin-source
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
fbb2cce
silence pil
GeoffreyCoulaud Jul 18, 2023
00ff297
Steam source debug info on skip
GeoffreyCoulaud Jul 18, 2023
15da65f
WIP heroic source refactor
GeoffreyCoulaud Jul 19, 2023
0601fd5
Converted genexps to setcomps
GeoffreyCoulaud Jul 19, 2023
a0bfca0
WIP added support for heroic hidden
GeoffreyCoulaud Jul 19, 2023
8839db2
better legendary sub-source library path detection
GeoffreyCoulaud Jul 19, 2023
a399113
fixed typo
GeoffreyCoulaud Jul 19, 2023
2acdedf
Added heroic import amazon to ui + fixes
GeoffreyCoulaud Jul 20, 2023
30152cd
simplified SourceIterator
GeoffreyCoulaud Jul 20, 2023
7f576d1
SourceIterator is actually just SourceIterable
GeoffreyCoulaud Jul 20, 2023
0df1239
Fix some syntax
GeoffreyCoulaud Jul 20, 2023
52b6c47
More renaming to iterable + fixes to heroic
GeoffreyCoulaud Jul 20, 2023
190b446
More debug messages + fix sideloaded heroic games
GeoffreyCoulaud Jul 20, 2023
bb4870e
Add debug message to local cover manager
GeoffreyCoulaud Jul 20, 2023
82dddd1
Skip missing hidden key
kra-mo Jul 20, 2023
270fa20
Fixed heroic location candidates priority
GeoffreyCoulaud Jul 20, 2023
4587720
using cached_property for sub-source paths
GeoffreyCoulaud Jul 20, 2023
da777d3
Permission for heroic flatpak's legendary files
GeoffreyCoulaud Jul 20, 2023
b1992a9
Fix heroic legendary path detection
GeoffreyCoulaud Jul 21, 2023
fbf0766
Better heroic store file parsing
GeoffreyCoulaud Jul 21, 2023
7bcb113
extracted get_hidden_app_names to a method
GeoffreyCoulaud Jul 21, 2023
9618fb7
Implement initial framework for Dolphin importer
RilicTheFox Jul 23, 2023
5708f48
Finish Dolphin importer, fix cache reader bug
RilicTheFox Jul 23, 2023
b378110
Launch Dolphin games without main Dolphin window
RilicTheFox Jul 25, 2023
26e8d6d
Merge pull request #150 from kra-mo/heroic-fixes-and-improvements
kra-mo Jul 25, 2023
b8cd1fd
Translations update from Hosted Weblate (#152)
weblate Jul 25, 2023
ca73023
v2.1
kra-mo Jul 25, 2023
0b577d2
Update translations
kra-mo Jul 25, 2023
f3dcdbf
Using a named tuple to store source locations
GeoffreyCoulaud Jul 26, 2023
0677eae
Removed unused import
GeoffreyCoulaud Jul 26, 2023
04d0e9e
Clarified location sub paths
GeoffreyCoulaud Jul 26, 2023
fa8a15a
Moved invalid location message to location
GeoffreyCoulaud Jul 26, 2023
1404878
Merge pull request #158 from kra-mo/locations-improvements
kra-mo Jul 26, 2023
d3a6eaa
Fix source id being translated
GeoffreyCoulaud Jul 27, 2023
f0afdcc
Merge pull request #160 from kra-mo/id-fix
kra-mo Jul 27, 2023
e554cf8
Translations update from Hosted Weblate (#155)
weblate Jul 27, 2023
459e13a
v2.1.1
kra-mo Jul 27, 2023
e4dc125
Specify runner in heroic protocol (#163)
imLinguin Jul 27, 2023
1aff134
Managers refactor (#164)
GeoffreyCoulaud Jul 31, 2023
436a54b
Merge remote-tracking branch 'upstream/main' into dolphin-importer
RilicTheFox Aug 3, 2023
0440eee
Convert to new importer format
RilicTheFox Aug 3, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions data/gtk/preferences.blp
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,15 @@ template $PreferencesWindow : Adw.PreferencesWindow {
}
}

Adw.ActionRow {
title: _("Import Amazon Games");
activatable-widget: heroic_import_amazon_switch;

Switch heroic_import_amazon_switch {
valign: center;
}
}

Adw.ActionRow {
title: _("Import Sideloaded Games");
activatable-widget: heroic_import_sideload_switch;
Expand All @@ -198,6 +207,20 @@ template $PreferencesWindow : Adw.PreferencesWindow {
}
}

Adw.ExpanderRow dolphin_expander_row {
title: _("Dolphin");
show-enable-switch: true;

Adw.ActionRow dolphin_cache_action_row {
title: _("Cache Location");

Button dolphin_cache_file_chooser_button {
icon-name: "folder-symbolic";
valign: center;
}
}
}

Adw.ExpanderRow itch_expander_row {
title: _("itch");
show-enable-switch: true;
Expand Down
9 changes: 9 additions & 0 deletions data/hu.kramo.Cartridges.gschema.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@
<key name="heroic-import-gog" type="b">
<default>true</default>
</key>
<key name="heroic-import-amazon" type="b">
<default>true</default>
</key>
<key name="heroic-import-sideload" type="b">
<default>true</default>
</key>
Expand All @@ -52,6 +55,12 @@
<key name="bottles-location" type="s">
<default>"~/.var/app/com.usebottles.bottles/data/bottles/"</default>
</key>
<key name="dolphin" type="b">
<default>true</default>
</key>
<key name="dolphin-cache-location" type="s">
<default>"~/.var/app/org.DolphinEmu.dolphin-emu/cache/dolphin-emu/"</default>
</key>
<key name="itch" type="b">
<default>true</default>
</key>
Expand Down
13 changes: 11 additions & 2 deletions data/hu.kramo.Cartridges.metainfo.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,19 @@
</screenshots>
<content_rating type="oars-1.1" />
<releases>
<release version="2.0.6" date="2023-07-21">
<release version="2.1.1" date="2023-07-27">
<description translatable="no">
<ul>
<li>Fixes an issue with Steam mods not importing properly</li>
<li>Fixes an issue with translations</li>
<li>Translations since 2.1</li>
</ul>
</description>
</release>
<release version="2.1" date="2023-07-25">
<description translatable="no">
<ul>
<li>Added support for Amazon Games in the Heroic importer</li>
<li>Translations since 2.0</li>
</ul>
</description>
</release>
Expand Down
2 changes: 2 additions & 0 deletions flatpak/hu.kramo.Cartridges.Devel.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@
"--socket=wayland",
"--talk-name=org.freedesktop.Flatpak",
"--filesystem=host:ro",
"--filesystem=~/.var/app/org.DolphinEmu.dolphin-emu:ro",
"--filesystem=~/.var/app/com.valvesoftware.Steam/data/Steam/:ro",
"--filesystem=~/.var/app/net.lutris.Lutris/:ro",
"--filesystem=~/.var/app/com.heroicgameslauncher.hgl/config/heroic/:ro",
"--filesystem=~/.var/app/com.heroicgameslauncher.hgl/config/legendary/:ro",
"--filesystem=~/.var/app/com.usebottles.bottles/data/bottles/:ro",
"--filesystem=~/.var/app/io.itch.itch/config/itch/:ro",
"--filesystem=/var/lib/flatpak:ro"
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project('cartridges',
version: '2.0.6',
version: '2.1.1',
meson_version: '>= 0.59.0',
default_options: [ 'warning_level=2', 'werror=false', ],
)
Expand Down
1 change: 1 addition & 0 deletions po/LINGUAS
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ pl
sv
tr
el
cs
76 changes: 42 additions & 34 deletions po/ar.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cartridges\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-05 14:36+0200\n"
"POT-Creation-Date: 2023-07-25 20:33+0200\n"
"PO-Revision-Date: 2023-07-09 07:59+0000\n"
"Last-Translator: Ali Aljishi <[email protected]>\n"
"Language-Team: Arabic <https://hosted.weblate.org/projects/cartridges/"
Expand All @@ -22,7 +22,7 @@ msgstr ""

#: data/hu.kramo.Cartridges.desktop.in:3
#: data/hu.kramo.Cartridges.metainfo.xml.in:6 data/gtk/window.blp:47
#: src/main.py:162
#: src/main.py:170
msgid "Cartridges"
msgstr "خراطيش"

Expand All @@ -36,7 +36,9 @@ msgid "Launch all your games"
msgstr "شغِّل كلَّ ألعابك"

#: data/hu.kramo.Cartridges.desktop.in:11
msgid "gaming;launcher;steam;lutris;heroic;bottles;itch;"
#, fuzzy
#| msgid "gaming;launcher;steam;lutris;heroic;bottles;itch;"
msgid "gaming;launcher;steam;lutris;heroic;bottles;itch;flatpak;legendary;"
msgstr "لعب;مشغل;ستيم;لوترس;هروك;قوارير;إتش;هيرويك;بوتلز;"

#: data/hu.kramo.Cartridges.metainfo.xml.in:9
Expand All @@ -63,7 +65,7 @@ msgid "Game Details"
msgstr "تفاصيل اللعبة"

#: data/hu.kramo.Cartridges.metainfo.xml.in:42 data/gtk/window.blp:416
#: src/details_window.py:239
#: src/details_window.py:241
msgid "Preferences"
msgstr "التفضيلات"

Expand Down Expand Up @@ -146,7 +148,7 @@ msgstr "أظهر التفضيلات"
msgid "Shortcuts"
msgstr "الاختصارات"

#: data/gtk/help-overlay.blp:34 src/game.py:102 src/preferences.py:112
#: data/gtk/help-overlay.blp:34 src/game.py:102 src/preferences.py:113
msgid "Undo"
msgstr "تراجع"

Expand Down Expand Up @@ -174,7 +176,7 @@ msgstr "أظهر الألعاب المخفية"
msgid "Remove game"
msgstr "أزل اللعبة"

#: data/gtk/preferences.blp:13 data/gtk/preferences.blp:268
#: data/gtk/preferences.blp:13 data/gtk/preferences.blp:277
msgid "Behavior"
msgstr "السلوك"

Expand Down Expand Up @@ -223,9 +225,9 @@ msgid "Steam"
msgstr "ستيم"

#: data/gtk/preferences.blp:96 data/gtk/preferences.blp:110
#: data/gtk/preferences.blp:151 data/gtk/preferences.blp:192
#: data/gtk/preferences.blp:206 data/gtk/preferences.blp:220
#: data/gtk/preferences.blp:234
#: data/gtk/preferences.blp:151 data/gtk/preferences.blp:201
#: data/gtk/preferences.blp:215 data/gtk/preferences.blp:229
#: data/gtk/preferences.blp:243
msgid "Install Location"
msgstr "موضع التثبيت"

Expand Down Expand Up @@ -258,54 +260,60 @@ msgid "Import GOG Games"
msgstr "استورد ألعاب جي‌أو‌جي"

#: data/gtk/preferences.blp:178
#, fuzzy
#| msgid "Import Steam Games"
msgid "Import Amazon Games"
msgstr "استورد ألعابًا من ستيم"

#: data/gtk/preferences.blp:187
msgid "Import Sideloaded Games"
msgstr "استورد ألعابًا مثبَّتةً بغير متجر"

#: data/gtk/preferences.blp:188
#: data/gtk/preferences.blp:197
msgid "Bottles"
msgstr "قوارير"

#: data/gtk/preferences.blp:202
#: data/gtk/preferences.blp:211
msgid "itch"
msgstr "إتش"

#: data/gtk/preferences.blp:216
#: data/gtk/preferences.blp:225
msgid "Legendary"
msgstr "لجندري"

#: data/gtk/preferences.blp:230
#: data/gtk/preferences.blp:239
msgid "Flatpak"
msgstr "فلاتباك"

#: data/gtk/preferences.blp:243
#: data/gtk/preferences.blp:252
msgid "Import Game Launchers"
msgstr "استورد مشغِّلات ألعاب"

#: data/gtk/preferences.blp:256
#: data/gtk/preferences.blp:265
msgid "SteamGridDB"
msgstr "SteamGridDB"

#: data/gtk/preferences.blp:260
#: data/gtk/preferences.blp:269
msgid "Authentication"
msgstr "الاستيثاق"

#: data/gtk/preferences.blp:263
#: data/gtk/preferences.blp:272
msgid "API Key"
msgstr "مفتاح واجهة البرمجة"

#: data/gtk/preferences.blp:271
#: data/gtk/preferences.blp:280
msgid "Use SteamGridDB"
msgstr "استخدم SteamGridDB"

#: data/gtk/preferences.blp:272
#: data/gtk/preferences.blp:281
msgid "Download images when adding or importing games"
msgstr "نزِّل الصور حينما تنزِّل أو تستورد الألعاب"

#: data/gtk/preferences.blp:281
#: data/gtk/preferences.blp:290
msgid "Prefer Over Official Images"
msgstr "فضِّلها على الصور الرسمية"

#: data/gtk/preferences.blp:290
#: data/gtk/preferences.blp:299
msgid "Prefer Animated Images"
msgstr "فضِّل الصور المتحرِّكة"

Expand Down Expand Up @@ -394,7 +402,7 @@ msgid "About Cartridges"
msgstr "عن «خراطيش»"

#. Translators: Replace this with your name for it to show up in the about window
#: src/main.py:180
#: src/main.py:188
msgid "translator_credits"
msgstr "Ali Aljishi <[email protected]>"

Expand Down Expand Up @@ -470,15 +478,15 @@ msgstr ""
msgid "Couldn't Add Game"
msgstr "تعذَّرت إضافة اللعبة"

#: src/details_window.py:147 src/details_window.py:181
#: src/details_window.py:147 src/details_window.py:183
msgid "Game title cannot be empty."
msgstr "لا يجوز كون عنوان اللعبة فارغًا."

#: src/details_window.py:153 src/details_window.py:189
#: src/details_window.py:153 src/details_window.py:191
msgid "Executable cannot be empty."
msgstr "لا يجوز كون ملفِّ التنفيذ فارغًا."

#: src/details_window.py:180 src/details_window.py:188
#: src/details_window.py:182 src/details_window.py:190
msgid "Couldn't Apply Preferences"
msgstr "تعذَّر تطبيق التفضيلات"

Expand All @@ -500,44 +508,44 @@ msgstr "أٌظهرت {}"
msgid "{} removed"
msgstr "أزيلت {}"

#: src/preferences.py:111
#: src/preferences.py:112
msgid "All games removed"
msgstr "أُزيلت كلُّ الألعاب"

#: src/preferences.py:159
#: src/preferences.py:160
msgid ""
"An API key is required to use SteamGridDB. You can generate one {}here{}."
msgstr ""
"تحتاج مفتاح واجهة برمجة حال ما أردت استخدام SteamGridDB، {}هنا تولِّده{}."

#: src/preferences.py:284
#: src/preferences.py:285
msgid "Installation Not Found"
msgstr "لم يُعثر على التثبيت"

#: src/preferences.py:286
#: src/preferences.py:287
msgid "Select a valid directory."
msgstr "حدِّد مجلَّدًا صالحًا."

#: src/preferences.py:348
#: src/preferences.py:349
msgid "Invalid Directory"
msgstr "مجلَّد غير صالح"

#. The variable is the name of the source
#: src/preferences.py:352
#: src/preferences.py:353
msgid "Select the {} cache directory."
msgstr "حدِّد مجلَّد ذاكرة {} المؤقتة."

#. The variable is the name of the source
#: src/preferences.py:355
#: src/preferences.py:356
msgid "Select the {} configuration directory."
msgstr "حدِّد مجلَّد ضبط {}."

#. The variable is the name of the source
#: src/preferences.py:358
#: src/preferences.py:359
msgid "Select the {} data directory."
msgstr "حدِّد مجلَّد بيانات {}."

#: src/preferences.py:364
#: src/preferences.py:365
msgid "Set Location"
msgstr "عيِّن الموضع"

Expand Down
Loading