Skip to content

Manic EMU is an all-in-one retro game emulator for iOS. It packs powerful features while keeping a clean, sleek UI and delivering buttery-smooth gameplay.

Swift

Optimize the Wii motion experience; optimize iCloud sync;

Daiuno44099603b7d0
diff --git a/Cores/dolphin.libretro.framework/dolphin.libretro b/Cores/dolphin.libretro.framework/dolphin.libretro
index 56741784..cffdbd54 100755
--- a/Cores/dolphin.libretro.framework/dolphin.libretro
+++ b/Cores/dolphin.libretro.framework/dolphin.libretro
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c2b6baa8e49231997249d6964b74202e316e28504add3d6c6330f0c51f59fa21
-size 21892544
+oid sha256:6a3c4256f03b2a28a865e48761b61fa6ff039816797e1e73fd280ba1f358b923
+size 21909072
diff --git a/Dependencies/Libretro b/Dependencies/Libretro
index 5f2ca692..0cf1033a 160000
--- a/Dependencies/Libretro
+++ b/Dependencies/Libretro
@@ -1 +1 @@
-Subproject commit 5f2ca692a115aa0223252188edc4302ff2a65c97
+Subproject commit 0cf1033ae6c1cea50fba00d00cea6a67ca91bc56
diff --git a/ManicEmu/ManicEmu.xcodeproj/project.pbxproj b/ManicEmu/ManicEmu.xcodeproj/project.pbxproj
index ce6c6e90..36202e2d 100644
--- a/ManicEmu/ManicEmu.xcodeproj/project.pbxproj
+++ b/ManicEmu/ManicEmu.xcodeproj/project.pbxproj
@@ -359,9 +359,6 @@
579093BB303C7D9100A53656 /* ASListPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5796DAEF2FE413C70051F661 /* ASListPage.swift */; };
579093BC303C7D9100A53656 /* GamesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 577006822D438E2A00762E8F /* GamesViewController.swift */; };
579093BD303C7D9100A53656 /* WebDavServiceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57F632AC2D6FEC25007270E8 /* WebDavServiceProvider.swift */; };
- 68A011012026091500000002 /* RommClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68A011012026091500000001 /* RommClient.swift */; };
- 68A011012026091500000004 /* RommServiceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68A011012026091500000003 /* RommServiceProvider.swift */; };
- 68A01101202609150000000A /* RommLibrary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68A011012026091500000009 /* RommLibrary.swift */; };
579093BE303C7D9100A53656 /* ThemeColorCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 570F590F2DC5BAF4007BFD92 /* ThemeColorCollectionViewCell.swift */; };
579093BF303C7D9100A53656 /* CheatTypeExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57B6ECCC2D798419002E619C /* CheatTypeExtensions.swift */; };
579093C0303C7D9100A53656 /* ARMaxDecrypt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57B6ECD02D7984A0002E619C /* ARMaxDecrypt.swift */; };
@@ -1054,9 +1051,6 @@
57CDCDA92FD5CBD3005BA4C8 /* TransparentHoleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 579076EF2D8AAC2800ED90FB /* TransparentHoleView.swift */; };
57CDCDAA2FD5CBD3005BA4C8 /* GamesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 577006822D438E2A00762E8F /* GamesViewController.swift */; };
57CDCDAC2FD5CBD3005BA4C8 /* WebDavServiceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57F632AC2D6FEC25007270E8 /* WebDavServiceProvider.swift */; };
- 68A011012026091500000005 /* RommClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68A011012026091500000001 /* RommClient.swift */; };
- 68A011012026091500000006 /* RommServiceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68A011012026091500000003 /* RommServiceProvider.swift */; };
- 68A01101202609150000000B /* RommLibrary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68A011012026091500000009 /* RommLibrary.swift */; };
57CDCDAD2FD5CBD3005BA4C8 /* ThemeColorCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 570F590F2DC5BAF4007BFD92 /* ThemeColorCollectionViewCell.swift */; };
57CDCDAE2FD5CBD3005BA4C8 /* CheatTypeExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57B6ECCC2D798419002E619C /* CheatTypeExtensions.swift */; };
57CDCDAF2FD5CBD3005BA4C8 /* OnlinePlaySettingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5754D88A2E274AB9001EA5ED /* OnlinePlaySettingView.swift */; };
@@ -1550,9 +1544,6 @@
57F632A32D6F17AB007270E8 /* SMBClient in Frameworks */ = {isa = PBXBuildFile; productRef = 57F632A22D6F17AB007270E8 /* SMBClient */; };
57F632AB2D6FEC0F007270E8 /* SMBServiceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57F632AA2D6FEBE7007270E8 /* SMBServiceProvider.swift */; };
57F632AD2D6FEC32007270E8 /* WebDavServiceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57F632AC2D6FEC25007270E8 /* WebDavServiceProvider.swift */; };
- 68A011012026091500000007 /* RommClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68A011012026091500000001 /* RommClient.swift */; };
- 68A011012026091500000008 /* RommServiceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68A011012026091500000003 /* RommServiceProvider.swift */; };
- 68A01101202609150000000C /* RommLibrary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68A011012026091500000009 /* RommLibrary.swift */; };
57F632E32D714E46007270E8 /* WebDavKit in Frameworks */ = {isa = PBXBuildFile; productRef = 57F632E22D714E46007270E8 /* WebDavKit */; };
57F632FE2D718236007270E8 /* SettingsListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57F632FD2D71822A007270E8 /* SettingsListView.swift */; };
57F633002D718366007270E8 /* SettingItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57F632FF2D718360007270E8 /* SettingItem.swift */; };
@@ -1574,6 +1565,15 @@
5F5353532F884986BF3BA407 /* ObjcExceptionBridging in Frameworks */ = {isa = PBXBuildFile; productRef = 5713306B2D91AFE00043C28A /* ObjcExceptionBridging */; };
5F74DFC689D94836B20159EB /* mednafen.ngp.libretro.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4C56A0D131A148448EA9816B /* mednafen.ngp.libretro.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
6606391530954FC29D88A93E /* MarqueeLabel in Frameworks */ = {isa = PBXBuildFile; productRef = 578E24432FD3EEE300A2749A /* MarqueeLabel */; };
+ 68A011012026091500000002 /* RommClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68A011012026091500000001 /* RommClient.swift */; };
+ 68A011012026091500000004 /* RommServiceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68A011012026091500000003 /* RommServiceProvider.swift */; };
+ 68A011012026091500000005 /* RommClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68A011012026091500000001 /* RommClient.swift */; };
+ 68A011012026091500000006 /* RommServiceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68A011012026091500000003 /* RommServiceProvider.swift */; };
+ 68A011012026091500000007 /* RommClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68A011012026091500000001 /* RommClient.swift */; };
+ 68A011012026091500000008 /* RommServiceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68A011012026091500000003 /* RommServiceProvider.swift */; };
+ 68A01101202609150000000A /* RommLibrary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68A011012026091500000009 /* RommLibrary.swift */; };
+ 68A01101202609150000000B /* RommLibrary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68A011012026091500000009 /* RommLibrary.swift */; };
+ 68A01101202609150000000C /* RommLibrary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68A011012026091500000009 /* RommLibrary.swift */; };
6FCEF6E3ACC94F29B594315F /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = 57C759232FD42D960093A2B3 /* Kingfisher */; };
71ABA13BC5694ED39346ED6C /* SwifterSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 578E246A2FD4017E00A2749A /* SwifterSwift */; };
75A984D24586436BA6AF31C9 /* Symbian.swift in Sources */ = {isa = PBXBuildFile; fileRef = 460B02C144024C2EAC5EAF21 /* Symbian.swift */; };
@@ -2056,7 +2056,6 @@
576F0E142D88208C00D2A1BA /* SettingsMembershipGiftView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsMembershipGiftView.swift; sourceTree = "<group>"; };
576F0E162D8820AB00D2A1BA /* MembershipInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MembershipInfoView.swift; sourceTree = "<group>"; };
577005542D3CC23A00762E8F /* FilesImporter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilesImporter.swift; sourceTree = "<group>"; };
- 68A011012026091500000009 /* RommLibrary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RommLibrary.swift; sourceTree = "<group>"; };
577005572D3CC30400762E8F /* FileType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileType.swift; sourceTree = "<group>"; };
577005592D3CC35500762E8F /* Game.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Game.swift; sourceTree = "<group>"; };
5770055C2D3CC3D700762E8F /* GameSaveState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameSaveState.swift; sourceTree = "<group>"; };
@@ -6705,8 +6704,6 @@
57F6328A2D6EB837007270E8 /* DownloadManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadManager.swift; sourceTree = "<group>"; };
57F632AA2D6FEBE7007270E8 /* SMBServiceProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SMBServiceProvider.swift; sourceTree = "<group>"; };
57F632AC2D6FEC25007270E8 /* WebDavServiceProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebDavServiceProvider.swift; sourceTree = "<group>"; };
- 68A011012026091500000001 /* RommClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RommClient.swift; sourceTree = "<group>"; };
- 68A011012026091500000003 /* RommServiceProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RommServiceProvider.swift; sourceTree = "<group>"; };
57F632FD2D71822A007270E8 /* SettingsListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsListView.swift; sourceTree = "<group>"; };
57F632FF2D718360007270E8 /* SettingItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingItem.swift; sourceTree = "<group>"; };
57F633032D718C45007270E8 /* LocaleExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocaleExtensions.swift; sourceTree = "<group>"; };
@@ -6716,6 +6713,9 @@
57FD140F3011C71E007F211A /* ShaderPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShaderPreviewView.swift; sourceTree = "<group>"; };
57J2ME01F23397000EA24F1 /* J2ME.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = J2ME.swift; sourceTree = "<group>"; };
6809D2DE31034EF5B9135498 /* FLASH.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FLASH.swift; sourceTree = "<group>"; };
+ 68A011012026091500000001 /* RommClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RommClient.swift; sourceTree = "<group>"; };
+ 68A011012026091500000003 /* RommServiceProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RommServiceProvider.swift; sourceTree = "<group>"; };
+ 68A011012026091500000009 /* RommLibrary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RommLibrary.swift; sourceTree = "<group>"; };
691349DFB9FB4307A3151455 /* NGC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NGC.swift; sourceTree = "<group>"; };
6A6021052A14459DA6F729AB /* vice.x64sc.libretro.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = vice.x64sc.libretro.framework; path = ../Cores/vice.x64sc.libretro.framework; sourceTree = SOURCE_ROOT; };
78D4867970474EB9B27D4D8D /* NGP.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NGP.swift; sourceTree = "<group>"; };
@@ -15856,7 +15856,7 @@
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
- SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+ SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG SIDE_LOAD";
SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/ManicEmu/Sources/Base/Bridging-Header.h";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
diff --git a/ManicEmu/ManicEmu/Resources/Config-Base.xcconfig b/ManicEmu/ManicEmu/Resources/Config-Base.xcconfig
index 5c125be0..2d57f49a 100644
--- a/ManicEmu/ManicEmu/Resources/Config-Base.xcconfig
+++ b/ManicEmu/ManicEmu/Resources/Config-Base.xcconfig
@@ -11,7 +11,7 @@
// https://help.apple.com/xcode/#/dev745c5c974
APP_BUNDLE_IDENTIFIER = com.aoshuang.manicemu
-APP_BUILD_VERSION = 8
+APP_BUILD_VERSION = 9
APP_VERSION = 2.0.1
// Prebuilt cores under ProjectManicEMU/Cores (Citra.framework, *.libretro.framework, …)
diff --git a/ManicEmu/ManicEmu/Resources/ar.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ar.lproj/Localizable.strings
index 526eb5ac..db1a0db1 100644
--- a/ManicEmu/ManicEmu/Resources/ar.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/ar.lproj/Localizable.strings
@@ -992,7 +992,6 @@
"BIOSCommondDesc" = "قد لا تعمل بعض الألعاب المحددة بشكل صحيح بدون BIOS.";
"WiiKeysBinDesc" = "يلزم keys.bin بتنسيق BootMii لتشغيل ألعاب Wii.";
"WiimoteSideways" = "Wiimote أفقي";
-"WiimoteDesc" = "في السكنة الافتراضية، تعيينات Wiimote:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「هز」\n「العصا اليمنى」 -> 「إمالة」";
"DolphinCoreWraning" = "نظرًا لحدود أداء JITless الحالية لنواة dolphin، قد يسخن الجهاز ويتلعثم مع انخفاض الإطارات أثناء المحاكاة، لكن هناك الكثير من الأبطال يعملون بجد خلف الكواليس للتحسين. كل شيء سيتحسن تدريجيًا، أليس كذلك؟";
"DolphinSaveTips" = "يُرجى استخدام تطبيق الملفات لفتح: Manic EMU - dolphin-emu - User لإدارة ملفات الحفظ بنفسك.";
"AchievementsSubset" = "مجموعة الإنجازات";
diff --git a/ManicEmu/ManicEmu/Resources/ca.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ca.lproj/Localizable.strings
index a5163a26..878f5453 100644
--- a/ManicEmu/ManicEmu/Resources/ca.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/ca.lproj/Localizable.strings
@@ -1021,7 +1021,6 @@ Si voleu millorar la vostra configuració, PlayCase és el complement perfecte p
"BIOSCommondDesc" = "Alguns jocs concrets poden no funcionar correctament sense un BIOS.";
"WiiKeysBinDesc" = "Cal un keys.bin en format BootMii per jugar a títols Wii.";
"WiimoteSideways" = "Wiimote horitzontal";
-"WiimoteDesc" = "A la skin per defecte, assignacions del Wiimote:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Sacseja」\n「Stick dret」 -> 「Inclina」";
"DolphinCoreWraning" = "A causa dels límits actuals de rendiment JITless del nucli dolphin, el dispositiu es pot escalfar i anar a batzegades amb pèrdua de fotogrames durant l'emulació, però hi ha molts herois treballant entre bambolines per optimitzar-ho. Tot anirà millorant a poc a poc, oi?";
"DolphinSaveTips" = "Fes servir l'app Fitxers per obrir: Manic EMU - dolphin-emu - User i gestionar tu mateix els fitxers de desament.";
"AchievementsSubset" = "Conjunt d'èxits";
diff --git a/ManicEmu/ManicEmu/Resources/cs.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/cs.lproj/Localizable.strings
index f0b5b08d..31aad60f 100644
--- a/ManicEmu/ManicEmu/Resources/cs.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/cs.lproj/Localizable.strings
@@ -1014,7 +1014,6 @@ Pokud chcete vylepšit své nastavení, PlayCase je perfektním doplňkem tohoto
"BIOSCommondDesc" = "Některé hry nemusí bez BIOS fungovat správně.";
"WiiKeysBinDesc" = "Ke hraní her Wii je potřeba keys.bin ve formátu BootMii.";
"WiimoteSideways" = "Wiimote na šířku";
-"WiimoteDesc" = "Ve výchozím skinu mapování Wiimote:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Zatřesení」\n「Pravý analog」 -> 「Náklon」";
"DolphinCoreWraning" = "Kvůli současným výkonnostním limitům jádra dolphin bez JIT se zařízení může zahřívat a emulace sekat s propady snímků. V zákulisí ale spousta hrdinů usilovně optimalizuje. Všechno se postupně zlepší, že?";
"DolphinSaveTips" = "Otevřete aplikaci Soubory: Manic EMU - dolphin-emu - User a spravujte soubory uložení sami.";
"AchievementsSubset" = "Sada úspěchů";
diff --git a/ManicEmu/ManicEmu/Resources/da.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/da.lproj/Localizable.strings
index cb93303e..b772b522 100644
--- a/ManicEmu/ManicEmu/Resources/da.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/da.lproj/Localizable.strings
@@ -1017,7 +1017,6 @@ Hvis du vil forbedre dit setup, er PlayCase et perfekt match til dette skin.";
"BIOSCommondDesc" = "Visse spil kører muligvis ikke korrekt uden BIOS.";
"WiiKeysBinDesc" = "keys.bin i BootMii-format er påkrævet for at spille Wii-spil.";
"WiimoteSideways" = "Wiimote på langs";
-"WiimoteDesc" = "I standard-skinnet gælder disse Wiimote-tilknytninger:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Ryst」\n「Højre thumbstick」 -> 「Vip」";
"DolphinCoreWraning" = "På grund af dolphin-kernens nuværende JITless-ydelsesgrænser kan enheden blive varm og hakke med framedrop under emulering. Bag kulisserne arbejder mange helte dog hårdt på at optimere. Alting bliver gradvist bedre, ikke?";
"DolphinSaveTips" = "Åbn med appen Filer: Manic EMU - dolphin-emu - User for selv at administrere dine gemte filer.";
"AchievementsSubset" = "Achievement-sæt";
diff --git a/ManicEmu/ManicEmu/Resources/de.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/de.lproj/Localizable.strings
index 6eb4637b..73605de6 100644
--- a/ManicEmu/ManicEmu/Resources/de.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/de.lproj/Localizable.strings
@@ -1020,7 +1020,6 @@ Wenn Sie Ihr Setup verbessern möchten, ist PlayCase die perfekte Ergänzung zu
"BIOSCommondDesc" = "Einige bestimmte Spiele laufen ohne BIOS möglicherweise nicht richtig.";
"WiiKeysBinDesc" = "Zum Spielen von Wii-Spielen wird keys.bin im BootMii-Format benötigt.";
"WiimoteSideways" = "Wiimote quer";
-"WiimoteDesc" = "Im Standard-Skin gelten folgende Wiimote-Belegungen:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Schütteln」\n「Rechter Thumbstick」 -> 「Neigen」";
"DolphinCoreWraning" = "Aufgrund der aktuellen JITless-Leistungsgrenzen des dolphin-Kerns kann das Gerät während der Emulation heiß werden und ruckeln. Hinter den Kulissen arbeiten aber viele Helden an Optimierungen. Alles wird nach und nach besser, oder?";
"DolphinSaveTips" = "Öffne mit der Dateien-App: Manic EMU - dolphin-emu - User, um deine Speicherdateien selbst zu verwalten.";
"AchievementsSubset" = "Erfolgsset";
diff --git a/ManicEmu/ManicEmu/Resources/el.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/el.lproj/Localizable.strings
index 4c9179f1..12884ac1 100644
--- a/ManicEmu/ManicEmu/Resources/el.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/el.lproj/Localizable.strings
@@ -1022,7 +1022,6 @@
"BIOSCommondDesc" = "Ορισμένα συγκεκριμένα παιχνίδια μπορεί να μην λειτουργούν σωστά χωρίς BIOS.";
"WiiKeysBinDesc" = "Απαιτείται keys.bin μορφής BootMii για να παίξετε παιχνίδια Wii.";
"WiimoteSideways" = "Wiimote Οριζόντια";
-"WiimoteDesc" = "Στο προεπιλεγμένο skin, αντιστοιχίσεις Wiimote:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Τίναγμα」\n「Δεξί Analog Stick」 -> 「Κλίση」";
"DolphinCoreWraning" = "Λόγω των τρεχόντων ορίων απόδοσης JITless του πυρήνα dolphin, η συσκευή μπορεί να ζεσταθεί και να κολλάει με πτώση καρέ κατά την εξομοίωση, αλλά πολλοί ήρωες εργάζονται σκληρά στα παρασκήνια για βελτιστοποίηση. Όλα θα βελτιωθούν σταδιακά, σωστά;";
"DolphinSaveTips" = "Χρησιμοποιήστε την εφαρμογή Αρχεία για να ανοίξετε: Manic EMU - dolphin-emu - User ώστε να διαχειριστείτε μόνοι σας τα αρχεία αποθήκευσης.";
"AchievementsSubset" = "Σετ Επιτευγμάτων";
diff --git a/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.strings
index 4a5eec00..f42a9378 100644
--- a/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.strings
@@ -1039,7 +1039,6 @@ Press the controller button to complete mapping...";
"BIOSCommondDesc" = "Some specific games may not run properly without a BIOS.";
"WiiKeysBinDesc" = "BootMii format keys.bin is required to play Wii games.";
"WiimoteSideways" = "Wiimote Sideways";
-"WiimoteDesc" = "In the default skin, Wiimote mappings:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Shake」\n「Right Thumbstick」 -> 「Tilt」";
"DolphinCoreWraning" = "Due to the current JITless performance limits of the dolphin core, the device may heat up and stutter with frame drops during game emulation, but there are plenty of heroes working hard behind the scenes to optimize things. Everything will gradually get better, right?";
"DolphinSaveTips" = "Please use the Files app to open: Manic EMU - dolphin-emu - User to manage your save files on your own.";
@@ -1185,3 +1184,6 @@ Press the controller button to complete mapping...";
"RommTransferFailed" = "Transfer failed. Check the server connection.";
"RommLanAddressOnly" = "RomM currently accepts LAN IP addresses only (such as 192.168.x.x, 10.x.x.x, or 169.254.x.x). Hostnames and public IPs are not supported yet.";
"LandServiceEditServerNamePlaceholder" = "My Server";
+
+"WiimoteMotionPlusSideways" = "Wiimote+MotionPlus Sideways";
+"WiimoteDesc" = "In the default skin, Wiimote mappings:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Shake」\n「Right Thumbstick」 -> 「Tilt」\nGames that require MotionPlus (such as Skyward Sword) need a Wiimote+MotionPlus controller type.";
diff --git a/ManicEmu/ManicEmu/Resources/es-419.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/es-419.lproj/Localizable.strings
index 187b7118..a6d87fab 100644
--- a/ManicEmu/ManicEmu/Resources/es-419.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/es-419.lproj/Localizable.strings
@@ -1019,7 +1019,6 @@ Si quieres mejorar tu experiencia, PlayCase combina perfecto con esta funda.";
"BIOSCommondDesc" = "Algunos juegos específicos pueden no funcionar bien sin un BIOS.";
"WiiKeysBinDesc" = "Para jugar juegos de Wii se necesita un keys.bin en formato BootMii.";
"WiimoteSideways" = "Wiimote horizontal";
-"WiimoteDesc" = "En la skin predeterminada, asignaciones del Wiimote:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Agitar」\n「Stick derecho」 -> 「Inclinar」";
"DolphinCoreWraning" = "Por los límites de rendimiento actuales sin JIT del núcleo dolphin, el dispositivo puede calentarse y perder fotogramas durante la emulación, pero hay un montón de héroes trabajando detrás de escena para optimizarlo. Todo irá mejorando de a poco, ¿verdad?";
"DolphinSaveTips" = "Usa la app Archivos para abrir: Manic EMU - dolphin-emu - User y gestiona tus archivos de guardado por tu cuenta.";
"AchievementsSubset" = "Conjunto de logros";
diff --git a/ManicEmu/ManicEmu/Resources/es.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/es.lproj/Localizable.strings
index 3af92e22..4ac2e0de 100644
--- a/ManicEmu/ManicEmu/Resources/es.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/es.lproj/Localizable.strings
@@ -994,7 +994,6 @@ Si quieres mejorar tu configuración, PlayCase es el complemento perfecto para e
"BIOSCommondDesc" = "Algunos juegos concretos pueden no funcionar bien sin un BIOS.";
"WiiKeysBinDesc" = "Para jugar a juegos de Wii hace falta un keys.bin en formato BootMii.";
"WiimoteSideways" = "Wiimote horizontal";
-"WiimoteDesc" = "En la skin predeterminada, asignaciones del Wiimote:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Agitar」\n「Stick derecho」 -> 「Inclinar」";
"DolphinCoreWraning" = "Por los límites de rendimiento actuales sin JIT del núcleo dolphin, el dispositivo puede calentarse y tirar fotogramas durante la emulación, pero hay un montón de héroes currando entre bastidores para optimizarlo. Todo irá mejorando poco a poco, ¿verdad?";
"DolphinSaveTips" = "Usa la app Archivos para abrir: Manic EMU - dolphin-emu - User y gestiona tus archivos de guardado por tu cuenta.";
"AchievementsSubset" = "Conjunto de logros";
diff --git a/ManicEmu/ManicEmu/Resources/fi.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/fi.lproj/Localizable.strings
index e0097adc..2aa4d453 100644
--- a/ManicEmu/ManicEmu/Resources/fi.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/fi.lproj/Localizable.strings
@@ -1022,7 +1022,6 @@ Jos haluat parantaa kokoonpanoasi, PlayCase on täydellinen lisä tälle skinill
"BIOSCommondDesc" = "Jotkin pelit eivät välttämättä toimi oikein ilman BIOS-tiedostoa.";
"WiiKeysBinDesc" = "Wii-pelien pelaamiseen tarvitaan BootMii-muotoinen keys.bin.";
"WiimoteSideways" = "Wiimote vaakasuunnassa";
-"WiimoteDesc" = "Oletusskinissä Wiimote-määritykset:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Ravistus」\n「Oikea tatti」 -> 「Kallistus」";
"DolphinCoreWraning" = "dolphin-ytimen nykyisten JITless-suorituskykyrajojen vuoksi laite voi kuumentua ja nykiä kuvan pätkimisen kera emuloinnin aikana, mutta kulissien takana lukuisat sankarit tekevät töitä optimoinnin eteen. Kaikki paranee vähitellen, eikö?";
"DolphinSaveTips" = "Avaa Tiedostot-sovelluksessa: Manic EMU - dolphin-emu - User ja hallitse tallennustiedostoja itse.";
"AchievementsSubset" = "Saavutussarja";
diff --git a/ManicEmu/ManicEmu/Resources/fr-CA.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/fr-CA.lproj/Localizable.strings
index 7c350404..f019f0b7 100644
--- a/ManicEmu/ManicEmu/Resources/fr-CA.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/fr-CA.lproj/Localizable.strings
@@ -1020,7 +1020,6 @@ Si vous voulez améliorer votre installation, PlayCase est le complément parfai
"BIOSCommondDesc" = "Certains jeux particuliers peuvent ne pas fonctionner correctement sans BIOS.";
"WiiKeysBinDesc" = "Un keys.bin au format BootMii est requis pour jouer aux jeux Wii.";
"WiimoteSideways" = "Wiimote à l'horizontale";
-"WiimoteDesc" = "Dans le skin par défaut, correspondances Wiimote :\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Secouer」\n「Stick droit」 -> 「Incliner」";
"DolphinCoreWraning" = "En raison des limites actuelles de performance sans JIT du cœur dolphin, l'appareil peut chauffer et saccader avec des pertes d'images pendant l'émulation, mais de nombreux héros travaillent en coulisse pour tout optimiser. Tout s'améliorera peu à peu, n'est-ce pas ?";
"DolphinSaveTips" = "Utilisez l'application Fichiers pour ouvrir : Manic EMU - dolphin-emu - User afin de gérer vos fichiers de sauvegarde vous-même.";
"AchievementsSubset" = "Série de succès";
diff --git a/ManicEmu/ManicEmu/Resources/fr.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/fr.lproj/Localizable.strings
index cc970dc3..80ab88ff 100644
--- a/ManicEmu/ManicEmu/Resources/fr.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/fr.lproj/Localizable.strings
@@ -1020,7 +1020,6 @@ Si vous souhaitez améliorer votre configuration, PlayCase est le complément id
"BIOSCommondDesc" = "Certains jeux spécifiques peuvent ne pas fonctionner correctement sans BIOS.";
"WiiKeysBinDesc" = "Un keys.bin au format BootMii est requis pour jouer aux jeux Wii.";
"WiimoteSideways" = "Wiimote à l'horizontale";
-"WiimoteDesc" = "Dans le skin par défaut, correspondances Wiimote :\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Secouer」\n「Stick droit」 -> 「Incliner」";
"DolphinCoreWraning" = "En raison des limites actuelles de performances sans JIT du cœur dolphin, l'appareil peut chauffer et saccader avec des pertes d'images pendant l'émulation, mais plein de héros s'affairent en coulisses pour optimiser tout ça. Tout s'améliorera peu à peu, non ?";
"DolphinSaveTips" = "Utilisez l'app Fichiers pour ouvrir : Manic EMU - dolphin-emu - User afin de gérer vos fichiers de sauvegarde vous-même.";
"AchievementsSubset" = "Série de succès";
diff --git a/ManicEmu/ManicEmu/Resources/he.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/he.lproj/Localizable.strings
index c1acb0f3..c42646f5 100644
--- a/ManicEmu/ManicEmu/Resources/he.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/he.lproj/Localizable.strings
@@ -1022,7 +1022,6 @@ PlayCase מתמקדת במעטפות iPhone איכותיות, המיוצרות
"BIOSCommondDesc" = "משחקים מסוימים עלולים שלא לרוץ כראוי ללא BIOS.";
"WiiKeysBinDesc" = "נדרש keys.bin בפורמט BootMii כדי לשחק במשחקי Wii.";
"WiimoteSideways" = "Wiimote לרוחב";
-"WiimoteDesc" = "ב-skin ברירת המחדל, מיפויי Wiimote:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「ניעור」\n「סטיק ימני」 -> 「הטיה」";
"DolphinCoreWraning" = "בשל מגבלות הביצועים הנוכחיות של ליבת dolphin ללא JIT (JITless), המכשיר עלול להתחמם ולהיתקע עם נפילות פריימים במהלך האמולציה, אבל יש לא מעט גיבורים שעובדים קשה מאחורי הקלעים לייעול. הכל ישתפר בהדרגה, נכון?";
"DolphinSaveTips" = "אנא השתמשו ביישום הקבצים כדי לפתוח: Manic EMU - dolphin-emu - User ולנהל את קבצי השמירה בעצמכם.";
"AchievementsSubset" = "סט הישגים";
diff --git a/ManicEmu/ManicEmu/Resources/hi.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/hi.lproj/Localizable.strings
index cdc8f71d..135f3e55 100644
--- a/ManicEmu/ManicEmu/Resources/hi.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/hi.lproj/Localizable.strings
@@ -1021,7 +1021,6 @@ PlayCase हाई-क्वालिटी iPhone केसों पर के
"BIOSCommondDesc" = "कुछ खास गेम BIOS के बिना सही से नहीं चल सकते।";
"WiiKeysBinDesc" = "Wii गेम खेलने के लिए BootMii फॉर्मेट की keys.bin आवश्यक है।";
"WiimoteSideways" = "Wiimote साइडवेज़";
-"WiimoteDesc" = "डिफ़ॉल्ट स्किन में Wiimote मैपिंग:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「शेक」\n「राइट थंबस्टिक」 -> 「टिल्ट」";
"DolphinCoreWraning" = "dolphin कोर की वर्तमान JITless परफ़ॉर्मेंस सीमा के कारण, गेम एमुलेशन के दौरान डिवाइस गर्म हो सकता है और फ्रेम ड्रॉप के साथ अटक सकता है, लेकिन पर्दे के पीछे कई हीरो कड़ी मेहनत से ऑप्टिमाइज़ कर रहे हैं। सब धीरे-धीरे बेहतर होगा, है ना?";
"DolphinSaveTips" = "कृपया फ़ाइल ऐप से खोलें: Manic EMU - dolphin-emu - User और सेव फ़ाइलें स्वयं प्रबंधित करें।";
"AchievementsSubset" = "उपलब्धि सेट";
diff --git a/ManicEmu/ManicEmu/Resources/hr.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/hr.lproj/Localizable.strings
index 8a0b1cbf..f647d388 100644
--- a/ManicEmu/ManicEmu/Resources/hr.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/hr.lproj/Localizable.strings
@@ -1019,7 +1019,6 @@ Ako želite unaprijediti svoju postavu, PlayCase je savršen dodatak ovom skinu.
"BIOSCommondDesc" = "Neke igre možda neće ispravno raditi bez BIOS-a.";
"WiiKeysBinDesc" = "Za igranje Wii igara potreban je keys.bin u formatu BootMii.";
"WiimoteSideways" = "Wiimote vodoravno";
-"WiimoteDesc" = "U zadanom skinu mapiranja Wiimote:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Protresanje」\n「Desni analog」 -> 「Nagib」";
"DolphinCoreWraning" = "Zbog trenutačnih ograničenja performansi jezgre dolphin bez JIT uređaj se može zagrijavati, a emulacija trzati uz padove sličica. Iza kulisa ipak mnogo heroja naporno optimizira. Sve će postupno biti bolje, zar ne?";
"DolphinSaveTips" = "Otvorite aplikaciju Datoteke: Manic EMU - dolphin-emu - User i sami upravljajte datotekama spremanja.";
"AchievementsSubset" = "Skup achievementa";
diff --git a/ManicEmu/ManicEmu/Resources/hu.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/hu.lproj/Localizable.strings
index e84824fd..7295329b 100644
--- a/ManicEmu/ManicEmu/Resources/hu.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/hu.lproj/Localizable.strings
@@ -1020,7 +1020,6 @@ Ha fejleszteni szeretnéd a beállításod, a PlayCase tökéletes kiegészítő
"BIOSCommondDesc" = "Egyes játékok BIOS nélkül nem futnak megfelelően.";
"WiiKeysBinDesc" = "A Wii játékokhoz BootMii formátumú keys.bin szükséges.";
"WiimoteSideways" = "Wiimote fektetve";
-"WiimoteDesc" = "Az alapértelmezett skinben a Wiimote-leképezések:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Rázás」\n「Jobb hüvelykujjkar」 -> 「Döntés」";
"DolphinCoreWraning" = "A dolphin mag jelenlegi JITless teljesítménykorlátai miatt a készülék felmelegedhet, és akadozhat képkockavesztéssel az emuláció során, de a kulisszák mögött rengeteg hős dolgozik az optimalizáláson. Minden fokozatosan jobb lesz, ugye?";
"DolphinSaveTips" = "A Fájlok alkalmazással nyissa meg: Manic EMU - dolphin-emu - User, és kezelje a mentésfájlokat saját maga.";
"AchievementsSubset" = "Teljesítménykészlet";
diff --git a/ManicEmu/ManicEmu/Resources/id.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/id.lproj/Localizable.strings
index 1338731f..fe501d1f 100644
--- a/ManicEmu/ManicEmu/Resources/id.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/id.lproj/Localizable.strings
@@ -1012,7 +1012,6 @@ Jika Anda ingin meningkatkan setup Anda, PlayCase adalah pasangan sempurna untuk
"BIOSCommondDesc" = "Beberapa permainan tertentu mungkin tidak berjalan dengan baik tanpa BIOS.";
"WiiKeysBinDesc" = "keys.bin berformat BootMii diperlukan untuk memainkan permainan Wii.";
"WiimoteSideways" = "Wiimote Melintang";
-"WiimoteDesc" = "Pada skin default, pemetaan Wiimote:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Goyangkan」\n「Thumbstick Kanan」 -> 「Miring」";
"DolphinCoreWraning" = "Karena batas performa JITless inti dolphin saat ini, perangkat dapat panas dan tersendat dengan frame drop selama emulasi, tetapi banyak pahlawan bekerja keras di balik layar untuk mengoptimalkannya. Semuanya akan berangsur membaik, kan?";
"DolphinSaveTips" = "Gunakan aplikasi File untuk membuka: Manic EMU - dolphin-emu - User dan kelola file simpanan Anda sendiri.";
"AchievementsSubset" = "Set Pencapaian";
diff --git a/ManicEmu/ManicEmu/Resources/it.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/it.lproj/Localizable.strings
index 14280868..d3c44465 100644
--- a/ManicEmu/ManicEmu/Resources/it.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/it.lproj/Localizable.strings
@@ -1023,7 +1023,6 @@ Se vuoi migliorare il tuo setup, PlayCase è l’abbinamento perfetto per questa
"BIOSCommondDesc" = "Alcuni giochi specifici potrebbero non funzionare correttamente senza un BIOS.";
"WiiKeysBinDesc" = "Per giocare ai titoli Wii è necessario keys.bin in formato BootMii.";
"WiimoteSideways" = "Wiimote orizzontale";
-"WiimoteDesc" = "Nella skin predefinita, mappature Wiimote:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Scuoti」\n「Stick destro」 -> 「Inclina」";
"DolphinCoreWraning" = "A causa degli attuali limiti prestazionali JITless del core dolphin, il dispositivo potrebbe surriscaldarsi e avere cali di frame durante l’emulazione, ma tanti eroi stanno lavorando dietro le quinte per ottimizzare. Tutto migliorerà gradualmente, no?";
"DolphinSaveTips" = "Usa l’app File per aprire: Manic EMU - dolphin-emu - User e gestire autonomamente i file di salvataggio.";
"AchievementsSubset" = "Set achievement";
diff --git a/ManicEmu/ManicEmu/Resources/ja.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ja.lproj/Localizable.strings
index 542278ce..37baf732 100644
--- a/ManicEmu/ManicEmu/Resources/ja.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/ja.lproj/Localizable.strings
@@ -1015,7 +1015,6 @@ PlayCaseは、アクセサリーやスキンとの互換性を考慮して作ら
"BIOSCommondDesc" = "一部のゲームは BIOS がないと正常に動作しない場合があります。";
"WiiKeysBinDesc" = "Wii ゲームをプレイするには BootMii 形式の keys.bin が必要です。";
"WiimoteSideways" = "Wiimote 横持ち";
-"WiimoteDesc" = "デフォルトスキンでの Wiimote マッピング:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「シェイク」\n「右スティック」 -> 「傾ける」";
"DolphinCoreWraning" = "現在の dolphin コアは JITless の性能制限があるため、ゲームエミュレーション中に端末が発熱したり、カクつきやフレーム落ちが発生することがあります。とはいえ、舞台裏では多くのヒーローが最適化に取り組んでいます。すべては少しずつ良くなっていく、よね?";
"DolphinSaveTips" = "ファイルアプリで Manic EMU - dolphin-emu - User を開き、セーブファイルをご自身で管理してください。";
"AchievementsSubset" = "実績セット";
diff --git a/ManicEmu/ManicEmu/Resources/ko.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ko.lproj/Localizable.strings
index 9a67594f..c97713e3 100644
--- a/ManicEmu/ManicEmu/Resources/ko.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/ko.lproj/Localizable.strings
@@ -1023,7 +1023,6 @@ PlayCase는 액세서리 및 스킨 호환성을 고려하여 제작된 고품
"BIOSCommondDesc" = "일부 게임은 BIOS가 없으면 제대로 실행되지 않을 수 있어요.";
"WiiKeysBinDesc" = "Wii 게임을 플레이하려면 BootMii 형식의 keys.bin이 필요해요.";
"WiimoteSideways" = "Wiimote 가로 잡기";
-"WiimoteDesc" = "기본 스킨에서 Wiimote 매핑:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「흔들기」\n「오른쪽 스틱」 -> 「기울기」";
"DolphinCoreWraning" = "현재 dolphin 코어의 JITless 성능 한계로 인해, 게임 에뮬레이션 중 기기가 뜨거워지고 끊김이나 프레임 드롭이 발생할 수 있어요. 그래도 뒤에서 많은 영웅들이 열심히 최적화하고 있으니, 조금씩 나아지겠죠?";
"DolphinSaveTips" = "파일 앱에서 Manic EMU - dolphin-emu - User를 열어 세이브 파일을 직접 관리해 주세요.";
"AchievementsSubset" = "업적 세트";
diff --git a/ManicEmu/ManicEmu/Resources/ms.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ms.lproj/Localizable.strings
index d87f0990..b1570a69 100644
--- a/ManicEmu/ManicEmu/Resources/ms.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/ms.lproj/Localizable.strings
@@ -993,7 +993,6 @@ Jika anda ingin meningkatkan persediaan anda, PlayCase adalah padanan sempurna u
"BIOSCommondDesc" = "Sesetengah permainan mungkin tidak berjalan dengan baik tanpa BIOS.";
"WiiKeysBinDesc" = "keys.bin format BootMii diperlukan untuk bermain permainan Wii.";
"WiimoteSideways" = "Wiimote Melintang";
-"WiimoteDesc" = "Dalam kulit lalai, pemetaan Wiimote:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Goncang」\n「Thumbstick Kanan」 -> 「Condong」";
"DolphinCoreWraning" = "Disebabkan had prestasi JITless teras dolphin semasa, peranti mungkin panas dan tersekat-sekat dengan kejatuhan bingkai semasa emulasi, tetapi ramai wira sedang bekerja keras di sebalik tabir untuk mengoptimumkannya. Semuanya akan beransur lebih baik, kan?";
"DolphinSaveTips" = "Sila gunakan aplikasi Fail untuk membuka: Manic EMU - dolphin-emu - User bagi mengurus fail simpanan anda sendiri.";
"AchievementsSubset" = "Set Pencapaian";
diff --git a/ManicEmu/ManicEmu/Resources/nb.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/nb.lproj/Localizable.strings
index 4e7a4517..188a5e89 100644
--- a/ManicEmu/ManicEmu/Resources/nb.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/nb.lproj/Localizable.strings
@@ -1011,7 +1011,6 @@ Hvis du vil forbedre oppsettet ditt, er PlayCase et perfekt tilbehør til dette
"BIOSCommondDesc" = "Enkelte spill kjører kanskje ikke skikkelig uten BIOS.";
"WiiKeysBinDesc" = "keys.bin i BootMii-format kreves for å spille Wii-spill.";
"WiimoteSideways" = "Wiimote på tvers";
-"WiimoteDesc" = "I standard-skinnet gjelder disse Wiimote-tilordningene:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Rist」\n「Høyre thumbstick」 -> 「Vipp」";
"DolphinCoreWraning" = "På grunn av dolphin-kjernens nåværende JITless-ytelsesgrenser kan enheten bli varm og hakke med framedrop under emulering. Bak kulissene jobber likevel mange helter hardt med optimalisering. Alt blir gradvis bedre, ikke sant?";
"DolphinSaveTips" = "Åpne med appen Filer: Manic EMU - dolphin-emu - User for å administrere lagringsfilene dine selv.";
"AchievementsSubset" = "Prestasjonssett";
diff --git a/ManicEmu/ManicEmu/Resources/nl.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/nl.lproj/Localizable.strings
index 10da4c8e..27aeee1a 100644
--- a/ManicEmu/ManicEmu/Resources/nl.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/nl.lproj/Localizable.strings
@@ -1020,7 +1020,6 @@ Als je je setup naar een hoger niveau wilt tillen, is PlayCase de perfecte match
"BIOSCommondDesc" = "Sommige specifieke games werken mogelijk niet goed zonder BIOS.";
"WiiKeysBinDesc" = "Om Wii-games te spelen is keys.bin in BootMii-formaat vereist.";
"WiimoteSideways" = "Wiimote dwars";
-"WiimoteDesc" = "In de standaardskin gelden deze Wiimote-toewijzingen:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Schudden」\n「Rechter thumbstick」 -> 「Kantelen」";
"DolphinCoreWraning" = "Door de huidige JITless-prestatielimieten van de dolphin-kern kan het apparaat tijdens emulatie warm worden en stotteren. Achter de schermen werken echter veel helden hard aan optimalisaties. Alles wordt geleidelijk beter, toch?";
"DolphinSaveTips" = "Open met de Bestanden-app: Manic EMU - dolphin-emu - User om je savebestanden zelf te beheren.";
"AchievementsSubset" = "Achievementset";
diff --git a/ManicEmu/ManicEmu/Resources/pl.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/pl.lproj/Localizable.strings
index ed2b7ae3..22fc9248 100644
--- a/ManicEmu/ManicEmu/Resources/pl.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/pl.lproj/Localizable.strings
@@ -993,7 +993,6 @@ Jeśli chcesz ulepszyć swoją konfigurację, PlayCase jest idealnym uzupełnien
"BIOSCommondDesc" = "Niektóre gry mogą działać nieprawidłowo bez BIOS.";
"WiiKeysBinDesc" = "Do gier Wii potrzebny jest keys.bin w formacie BootMii.";
"WiimoteSideways" = "Wiimote w poziomie";
-"WiimoteDesc" = "W domyślnej skórce mapowania Wiimote:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Potrząśnięcie」\n「Prawy analog」 -> 「Pochylenie」";
"DolphinCoreWraning" = "Z powodu obecnych ograniczeń wydajności rdzenia dolphin bez JIT urządzenie może się nagrzewać, a emulacja — przycinać ze spadkami klatek. Za kulisami wielu bohaterów ciężko pracuje nad optymalizacją. Wszystko stopniowo się poprawi, prawda?";
"DolphinSaveTips" = "Otwórz aplikację Pliki: Manic EMU - dolphin-emu - User i samodzielnie zarządzaj plikami zapisów.";
"AchievementsSubset" = "Zestaw osiągnięć";
diff --git a/ManicEmu/ManicEmu/Resources/pt-BR.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/pt-BR.lproj/Localizable.strings
index 82b51f01..6ca01092 100644
--- a/ManicEmu/ManicEmu/Resources/pt-BR.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/pt-BR.lproj/Localizable.strings
@@ -1020,7 +1020,6 @@ Se você deseja aprimorar sua configuração, a PlayCase é o complemento perfei
"BIOSCommondDesc" = "Alguns jogos específicos podem não rodar corretamente sem um BIOS.";
"WiiKeysBinDesc" = "É necessário um keys.bin no formato BootMii para jogar títulos Wii.";
"WiimoteSideways" = "Wiimote na horizontal";
-"WiimoteDesc" = "Na skin padrão, mapeamentos do Wiimote:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Agitar」\n「Analógico direito」 -> 「Inclinar」";
"DolphinCoreWraning" = "Devido aos limites atuais de desempenho JITless do núcleo dolphin, o dispositivo pode esquentar e apresentar travamentos com queda de frames durante a emulação, mas há muitos heróis trabalhando nos bastidores para otimizar. Tudo vai melhorar aos poucos, certo?";
"DolphinSaveTips" = "Use o app Arquivos para abrir: Manic EMU - dolphin-emu - User e gerenciar seus arquivos de save por conta própria.";
"AchievementsSubset" = "Conjunto de conquistas";
diff --git a/ManicEmu/ManicEmu/Resources/pt-PT.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/pt-PT.lproj/Localizable.strings
index 38f295c9..76ec9ea6 100644
--- a/ManicEmu/ManicEmu/Resources/pt-PT.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/pt-PT.lproj/Localizable.strings
@@ -1021,7 +1021,6 @@ Se pretende melhorar a sua configuração, a PlayCase é o complemento perfeito
"BIOSCommondDesc" = "Alguns jogos específicos podem não funcionar corretamente sem um BIOS.";
"WiiKeysBinDesc" = "É necessário um keys.bin no formato BootMii para jogar títulos Wii.";
"WiimoteSideways" = "Wiimote na horizontal";
-"WiimoteDesc" = "Na skin predefinida, mapeamentos do Wiimote:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Agitar」\n「Mini-joystick direito」 -> 「Inclinar」";
"DolphinCoreWraning" = "Devido aos limites atuais de desempenho JITless do núcleo dolphin, o dispositivo pode aquecer e apresentar engasgos com perda de fotogramas durante a emulação, mas há muitos heróis a trabalhar nos bastidores para otimizar. Tudo vai melhorar gradualmente, certo?";
"DolphinSaveTips" = "Utilize a app Ficheiros para abrir: Manic EMU - dolphin-emu - User e gerir os seus ficheiros de gravação por conta própria.";
"AchievementsSubset" = "Conjunto de conquistas";
diff --git a/ManicEmu/ManicEmu/Resources/ro.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ro.lproj/Localizable.strings
index b4d34053..6a905633 100644
--- a/ManicEmu/ManicEmu/Resources/ro.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/ro.lproj/Localizable.strings
@@ -1020,7 +1020,6 @@ Dacă vrei să îți îmbunătățești setup-ul, PlayCase este potrivirea perfe
"BIOSCommondDesc" = "Unele jocuri specifice pot să nu ruleze corect fără un BIOS.";
"WiiKeysBinDesc" = "Este necesar un keys.bin în format BootMii pentru a juca jocuri Wii.";
"WiimoteSideways" = "Wiimote orizontal";
-"WiimoteDesc" = "În skin-ul implicit, mapări Wiimote:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Scutură」\n「Stick dreapta」 -> 「Înclină」";
"DolphinCoreWraning" = "Din cauza limitelor actuale de performanță JITless ale nucleului dolphin, dispozitivul se poate încălzi și poate avea întreruperi cu scăderi de cadre în timpul emulării, dar mulți eroi lucrează din culise pentru a optimiza. Totul se va îmbunătăți treptat, nu-i așa?";
"DolphinSaveTips" = "Folosește aplicația Fișiere pentru a deschide: Manic EMU - dolphin-emu - User și a-ți gestiona singur fișierele de salvare.";
"AchievementsSubset" = "Set de realizări";
diff --git a/ManicEmu/ManicEmu/Resources/ru.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ru.lproj/Localizable.strings
index 124e9ea6..d10f068b 100644
--- a/ManicEmu/ManicEmu/Resources/ru.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/ru.lproj/Localizable.strings
@@ -1014,7 +1014,6 @@ PlayCase специализируется на высококачественн
"BIOSCommondDesc" = "Некоторые игры могут работать некорректно без BIOS.";
"WiiKeysBinDesc" = "Для запуска игр Wii нужен keys.bin в формате BootMii.";
"WiimoteSideways" = "Wiimote горизонтально";
-"WiimoteDesc" = "В стандартном скине сопоставления Wiimote:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Встряхивание」\n「Правый стик」 -> 「Наклон」";
"DolphinCoreWraning" = "Из-за текущих ограничений производительности ядра dolphin без JIT устройство может нагреваться, а эмуляция — подтормаживать с просадками кадров. Но за кулисами много героев продолжают оптимизацию. Всё постепенно станет лучше, правда?";
"DolphinSaveTips" = "Откройте приложение «Файлы»: Manic EMU - dolphin-emu - User и управляйте файлами сохранений самостоятельно.";
"AchievementsSubset" = "Набор достижений";
diff --git a/ManicEmu/ManicEmu/Resources/sk.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/sk.lproj/Localizable.strings
index 07af2c87..428ce5ac 100644
--- a/ManicEmu/ManicEmu/Resources/sk.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/sk.lproj/Localizable.strings
@@ -1020,7 +1020,6 @@ Ak chcete vylepšiť svoje nastavenie, PlayCase je perfektným doplnkom tohto sk
"BIOSCommondDesc" = "Niektoré hry nemusia bez BIOS fungovať správne.";
"WiiKeysBinDesc" = "Na hranie hier Wii je potrebný keys.bin vo formáte BootMii.";
"WiimoteSideways" = "Wiimote na šírku";
-"WiimoteDesc" = "V predvolenom skine mapovania Wiimote:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Zatrasiť」\n「Pravý analóg」 -> 「Náklon」";
"DolphinCoreWraning" = "Kvôli súčasným výkonnostným limitom jadra dolphin bez JIT sa zariadenie môže zahrievať a emulácia sekať s prepadmi snímok. V zákulisí však veľa hrdinov usilovne optimalizuje. Všetko sa postupne zlepší, však?";
"DolphinSaveTips" = "Otvorte aplikáciu Súbory: Manic EMU - dolphin-emu - User a spravujte súbory uložení sami.";
"AchievementsSubset" = "Sada achievementov";
diff --git a/ManicEmu/ManicEmu/Resources/sv.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/sv.lproj/Localizable.strings
index 76bddca9..8752b737 100644
--- a/ManicEmu/ManicEmu/Resources/sv.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/sv.lproj/Localizable.strings
@@ -1013,7 +1013,6 @@ Om du vill höja din upplevelse är PlayCase en perfekt match för detta skin.";
"BIOSCommondDesc" = "Vissa specifika spel kanske inte fungerar ordentligt utan BIOS.";
"WiiKeysBinDesc" = "keys.bin i BootMii-format krävs för att spela Wii-spel.";
"WiimoteSideways" = "Wiimote i sidled";
-"WiimoteDesc" = "I standardskinnet gäller dessa Wiimote-mappningar:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Skaka」\n「Höger thumbstick」 -> 「Luta」";
"DolphinCoreWraning" = "På grund av dolphin-kärnans nuvarande JITless-prestandagränser kan enheten bli varm och hakka med bildtapp under emulering. Bakom kulisserna jobbar dock många hjältar hårt med optimeringar. Allt blir stegvis bättre, eller hur?";
"DolphinSaveTips" = "Öppna med appen Filer: Manic EMU - dolphin-emu - User för att hantera dina sparfiler själv.";
"AchievementsSubset" = "Prestationsset";
diff --git a/ManicEmu/ManicEmu/Resources/th.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/th.lproj/Localizable.strings
index d429c658..ed21ffb0 100644
--- a/ManicEmu/ManicEmu/Resources/th.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/th.lproj/Localizable.strings
@@ -1009,7 +1009,6 @@ PlayCase มุ่งเน้นที่เคส iPhone คุณภาพส
"BIOSCommondDesc" = "เกมบางรายอาจทำงานไม่ถูกต้องหากไม่มี BIOS";
"WiiKeysBinDesc" = "ต้องใช้ keys.bin รูปแบบ BootMii เพื่อเล่นเกม Wii";
"WiimoteSideways" = "Wiimote แนวนอน";
-"WiimoteDesc" = "ใน Skin เริ่มต้น การแมป Wiimote:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「เขย่า」\n「อนาล็อกขวา」 -> 「เอียง」";
"DolphinCoreWraning" = "เนื่องจากขีดจำกัดประสิทธิภาพ JITless ของคอร์ dolphin ในตอนนี้ เครื่องอาจร้อนและกระตุกพร้อมเฟรมดรอประหว่างจำลอง แต่มีฮีโร่หลายคนกำลังเร่งเพิ่มประสิทธิภาพอยู่เบื้องหลัง ทุกอย่างจะค่อย ๆ ดีขึ้นใช่ไหม?";
"DolphinSaveTips" = "โปรดใช้แอปไฟล์เปิด: Manic EMU - dolphin-emu - User เพื่อจัดการไฟล์เซฟด้วยตนเอง";
"AchievementsSubset" = "ชุดความสำเร็จ";
diff --git a/ManicEmu/ManicEmu/Resources/tr.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/tr.lproj/Localizable.strings
index 17170e3f..656df223 100644
--- a/ManicEmu/ManicEmu/Resources/tr.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/tr.lproj/Localizable.strings
@@ -1019,7 +1019,6 @@ Kurulumunuzu bir üst seviyeye taşımak istiyorsanız, PlayCase bu kaplama içi
"BIOSCommondDesc" = "Bazı oyunlar BIOS olmadan düzgün çalışmayabilir.";
"WiiKeysBinDesc" = "Wii oyunlarını oynamak için BootMii formatında keys.bin gerekir.";
"WiimoteSideways" = "Wiimote Yatay";
-"WiimoteDesc" = "Varsayılan skinde Wiimote eşlemeleri:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Salla」\n「Sağ Analog Çubuk」 -> 「Eğ」";
"DolphinCoreWraning" = "dolphin çekirdeğinin şu anki JITless performans sınırları nedeniyle, oyun emülasyonu sırasında cihaz ısınabilir ve kare düşüşleriyle takılabilir; ancak perde arkasında birçok kahraman durmaksızın iyileştirme yapıyor. Her şey yavaş yavaş düzelecek, değil mi?";
"DolphinSaveTips" = "Kayıt dosyalarını kendin yönetmek için Dosyalar uygulamasında şunu aç: Manic EMU - dolphin-emu - User.";
"AchievementsSubset" = "Başarım Seti";
diff --git a/ManicEmu/ManicEmu/Resources/uk.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/uk.lproj/Localizable.strings
index 145b5d16..b307762b 100644
--- a/ManicEmu/ManicEmu/Resources/uk.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/uk.lproj/Localizable.strings
@@ -1020,7 +1020,6 @@ PlayCase спеціалізується на високоякісних чохл
"BIOSCommondDesc" = "Деякі ігри можуть працювати некоректно без BIOS.";
"WiiKeysBinDesc" = "Для запуску ігор Wii потрібен keys.bin у форматі BootMii.";
"WiimoteSideways" = "Wiimote горизонтально";
-"WiimoteDesc" = "У типовому скіні прив’язки Wiimote:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Струс」\n「Правий стік」 -> 「Нахил」";
"DolphinCoreWraning" = "Через поточні обмеження продуктивності ядра dolphin без JIT пристрій може нагріватися, а емуляція — підгальмовувати з просіданням кадрів. Але за лаштунками чимало героїв працюють над оптимізацією. Усе поступово стане краще, правда?";
"DolphinSaveTips" = "Відкрийте програму «Файли»: Manic EMU - dolphin-emu - User і керуйте файлами збережень самостійно.";
"AchievementsSubset" = "Набір досягнень";
diff --git a/ManicEmu/ManicEmu/Resources/vi.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/vi.lproj/Localizable.strings
index dcd95847..d99ddd91 100644
--- a/ManicEmu/ManicEmu/Resources/vi.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/vi.lproj/Localizable.strings
@@ -1013,7 +1013,6 @@ Nếu bạn muốn nâng cấp thiết lập của mình, PlayCase là sự kế
"BIOSCommondDesc" = "Một số trò chơi cụ thể có thể không chạy đúng nếu thiếu BIOS.";
"WiiKeysBinDesc" = "Cần keys.bin định dạng BootMii để chơi trò chơi Wii.";
"WiimoteSideways" = "Wiimote ngang";
-"WiimoteDesc" = "Trong skin mặc định, ánh xạ Wiimote:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「Lắc」\n「Thumbstick phải」 -> 「Nghiêng」";
"DolphinCoreWraning" = "Do giới hạn hiệu năng JITless hiện tại của lõi dolphin, máy có thể nóng và giật, tụt khung hình khi giả lập, nhưng nhiều người đang âm thầm tối ưu. Mọi thứ sẽ dần khá hơn, phải không?";
"DolphinSaveTips" = "Hãy dùng ứng dụng Files để mở: Manic EMU - dolphin-emu - User và tự quản lý tệp lưu.";
"AchievementsSubset" = "Bộ thành tựu";
diff --git a/ManicEmu/ManicEmu/Resources/zh-HK.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/zh-HK.lproj/Localizable.strings
index c242ad19..6e3cfd93 100644
--- a/ManicEmu/ManicEmu/Resources/zh-HK.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/zh-HK.lproj/Localizable.strings
@@ -1025,7 +1025,6 @@ PlayCase 專注於製造高品質 iPhone 手機殼,設計時已充分考慮配
"BIOSCommondDesc" = "某些特定遊戲在沒有 BIOS 的情況下可能無法正常運行";
"WiiKeysBinDesc" = "運行 Wii 遊戲需要 BootMii 格式的 keys.bin。";
"WiimoteSideways" = "Wiimote 橫握";
-"WiimoteDesc" = "預設皮膚中,Wiimote映射關係:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「搖晃」\n「右搖桿」 -> 「傾斜」";
"DolphinCoreWraning" = "受限於現階段 dolphin 核心的 JITless 效能限制,遊戲模擬中裝置會發熱並卡頓掉幀,但是背後還有眾多英雄們在努力優化中,一切都會慢慢變好的,對吧!";
"DolphinSaveTips" = "請使用「檔案」App 打開:Manic EMU - dolphin-emu - User,自行管理存檔檔案。";
"AchievementsSubset" = "成就集";
diff --git a/ManicEmu/ManicEmu/Resources/zh-Hans.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/zh-Hans.lproj/Localizable.strings
index 27282f19..c37a0e0c 100644
--- a/ManicEmu/ManicEmu/Resources/zh-Hans.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/zh-Hans.lproj/Localizable.strings
@@ -1033,7 +1033,6 @@
"BIOSCommondDesc" = "某些特定游戏在没有 BIOS 的情况下可能无法正常运行";
"WiiKeysBinDesc" = "运行 Wii 游戏需要 BootMii 格式的 keys.bin。";
"WiimoteSideways" = "Wiimote 横握";
-"WiimoteDesc" = "默认皮肤中,Wiimote映射关系:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「摇晃」\n「右摇杆」 -> 「倾斜」";
"DolphinCoreWraning" = "受限于现阶段 dolphin 核心的 JITless 性能限制,游戏模拟中设备会发烫并卡顿掉帧,但是背后还有众多英雄们在努力优化中,一切都会慢慢变好的,对吧!";
"DolphinSaveTips" = "请使用 文件 App, 打开目录: Manic EMU - dolphin-emu - User 自行进行管理存档文件";
@@ -1179,3 +1178,6 @@
"RommTransferFailed" = "同步失败,请检查服务器连接。";
"RommLanAddressOnly" = "RomM 目前仅支持局域网 IP 地址(如 192.168.x.x、10.x.x.x 或 169.254.x.x),暂不支持主机名和公网 IP。";
"LandServiceEditServerNamePlaceholder" = "我的服务器";
+
+"WiimoteMotionPlusSideways" = "Wiimote+MotionPlus 横握";
+"WiimoteDesc" = "默认皮肤中,Wiimote 映射关系:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「摇晃」\n「右摇杆」 -> 「倾斜」\n需要 MotionPlus 的游戏(如《天空之剑》)请选择 Wiimote+MotionPlus 控制器类型。";
diff --git a/ManicEmu/ManicEmu/Resources/zh-Hant.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/zh-Hant.lproj/Localizable.strings
index 4efa4a4d..02d265f0 100644
--- a/ManicEmu/ManicEmu/Resources/zh-Hant.lproj/Localizable.strings
+++ b/ManicEmu/ManicEmu/Resources/zh-Hant.lproj/Localizable.strings
@@ -1025,7 +1025,6 @@ PlayCase 專注於高品質 iPhone 保護殼,設計時充分考慮了配件與
"BIOSCommondDesc" = "部分特定遊戲在沒有 BIOS 的情況下可能無法正常執行";
"WiiKeysBinDesc" = "執行 Wii 遊戲需要 BootMii 格式的 keys.bin。";
"WiimoteSideways" = "Wiimote 橫握";
-"WiimoteDesc" = "預設皮膚中,Wiimote 對應關係:\n「X」 -> 「1」\n「Y」 -> 「2」\n「ZL」 -> 「搖晃」\n「右搖桿」 -> 「傾斜」";
"DolphinCoreWraning" = "受限於現階段 dolphin 核心的 JITless 效能限制,遊戲模擬時裝置會發熱並出現卡頓掉幀,但背後還有許多英雄正在努力優化,一切都會慢慢變好的,對吧!";
"DolphinSaveTips" = "請使用「檔案」App 開啟:Manic EMU - dolphin-emu - User,自行管理存檔檔案。";
"AchievementsSubset" = "成就集";
diff --git a/ManicEmu/ManicEmu/Sources/Base/AppDelegate.swift b/ManicEmu/ManicEmu/Sources/Base/AppDelegate.swift
index bd0f6324..3ecc93f2 100644
--- a/ManicEmu/ManicEmu/Sources/Base/AppDelegate.swift
+++ b/ManicEmu/ManicEmu/Sources/Base/AppDelegate.swift
@@ -43,10 +43,15 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
if !OrientationLockPin.isPinned {
UIViewController.attemptRotationToDeviceOrientation()
}
- if #available(iOS 26.0, *) {
- let root = ApplicationSceneDelegate.applicationWindow?.rootViewController
- root?.setNeedsUpdateOfSupportedInterfaceOrientations()
- root?.setNeedsUpdateOfPrefersInterfaceOrientationLocked()
+ if #available(iOS 16.0, *) {
+ var vc = ApplicationSceneDelegate.applicationWindow?.rootViewController
+ while let current = vc {
+ current.setNeedsUpdateOfSupportedInterfaceOrientations()
+ if #available(iOS 26.0, *) {
+ current.setNeedsUpdateOfPrefersInterfaceOrientationLocked()
+ }
+ vc = current.presentedViewController
+ }
}
}
}
diff --git a/ManicEmu/ManicEmu/Sources/Base/Constants.swift b/ManicEmu/ManicEmu/Sources/Base/Constants.swift
index 1948c87d..2831c295 100644
--- a/ManicEmu/ManicEmu/Sources/Base/Constants.swift
+++ b/ManicEmu/ManicEmu/Sources/Base/Constants.swift
@@ -634,7 +634,14 @@ extension _R {
"Classic Controller Pro",
"Wiimote",
R.string.localizable.wiimoteSideways(),
- "Wiimote+Nunchuk"
+ "Wiimote+Nunchuk",
+ "Classic Controller",
+ "Wiimote+MotionPlus",
+ R.string.localizable.wiimoteMotionPlusSideways(),
+ "Wiimote+MotionPlus+Nunchuk",
+ "Wiimote+MotionPlus+Classic Controller",
+ "Wiimote+MotionPlus+Classic Controller Pro",
+ "GameCube Controller"
]
static let SymbianEdgeSkinIdentifier = "public.aoshuang.game.symbian.standard.edge"
static let SymbianEdgeFlexSkinIdentifier = "public.aoshuang.game.symbian.edge.flex"
diff --git a/ManicEmu/ManicEmu/Sources/Business/GameInfo/Models/SpecialCoreOption.swift b/ManicEmu/ManicEmu/Sources/Business/GameInfo/Models/SpecialCoreOption.swift
index ffc76593..14f2c366 100644
--- a/ManicEmu/ManicEmu/Sources/Business/GameInfo/Models/SpecialCoreOption.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/GameInfo/Models/SpecialCoreOption.swift
@@ -197,6 +197,12 @@ enum SpecialCoreOption: String {
case dolphin_wii_logi_microphone_enable
case dolphin_bluetooth_passthrough
case dolphin_language
+ /// 2 = mouse/pointer controls Wiimote IR (touch on the game image).
+ case dolphin_ir_mode
+ case dolphin_ir_yaw
+ case dolphin_ir_pitch
+ /// 0 portrait, 1 landscapeLeft, 2 upside down, 3 landscapeRight.
+ case dolphin_motion_rotation
//pce
case pce_default_joypad_type_p1
@@ -370,7 +376,11 @@ enum SpecialCoreOption: String {
.dolphin_cheats_import,
.dolphin_cpu_core,
.dolphin_skip_gc_bios,
- .dolphin_language]
+ .dolphin_language,
+ .dolphin_ir_mode,
+ .dolphin_ir_yaw,
+ .dolphin_ir_pitch,
+ .dolphin_motion_rotation]
if game.gameType == .wii {
result += [.dolphin_gc_sp1,
.dolphin_enable_gamecube_mic,
@@ -572,6 +582,11 @@ enum SpecialCoreOption: String {
if game.gameType == .psp, !LibretroCore.jitAvailable() || !game.jit {
resolvedCoreConfigs[Self.ppsspp_software_rendering_jit.rawValue] = "disabled"
}
+ if game.gameType == .wii {
+ resolvedCoreConfigs[Self.dolphin_ir_mode.rawValue] = "2"
+ resolvedCoreConfigs[Self.dolphin_ir_yaw.rawValue] = "40"
+ resolvedCoreConfigs[Self.dolphin_ir_pitch.rawValue] = "30"
+ }
return resolvedCoreConfigs
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Games/Models/GameOption.swift b/ManicEmu/ManicEmu/Sources/Business/Games/Models/GameOption.swift
index 412edd3f..ef43eb9e 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Games/Models/GameOption.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Games/Models/GameOption.swift
@@ -942,7 +942,7 @@ enum GameOption: Int, CaseIterable {
let firstGameValue = firstGame.getExtraInt(key: extraKey) ?? 0
if games.allSatisfy({
($0.getExtraInt(key: extraKey) ?? 0) == firstGameValue
- }) {
+ }), R.Strings.WiiControllers.indices.contains(firstGameValue) {
return .chevron(R.Strings.WiiControllers[firstGameValue])
}
@@ -975,9 +975,9 @@ enum GameOption: Int, CaseIterable {
($0.getExtraInt(key: extraKey) ?? 0) == firstGameValue
}) {
if firstGameValue == 0 {
- return .chevron(R.string.localizable.skinSegmentPortraitTitle())
- } else {
return .chevron(R.string.localizable.skinSegmentLandscapeTitle())
+ } else {
+ return .chevron(R.string.localizable.skinSegmentPortraitTitle())
}
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Games/Models/GameOptionPerform.swift b/ManicEmu/ManicEmu/Sources/Business/Games/Models/GameOptionPerform.swift
index 25af4f69..68eaf676 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Games/Models/GameOptionPerform.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Games/Models/GameOptionPerform.swift
@@ -1584,15 +1584,14 @@ extension GameOption {
let realm = Database.realm
if let currentSkinID = PlayViewController.currentSkinID,
let skin = realm.object(ofType: Skin.self, forPrimaryKey: currentSkinID) {
- if controllerType == .classicPro, skin.skinType != .default {
+ if !controllerType.usesWiimoteSkin, skin.skinType != .default {
PlayViewController.updateSkin()
- } else if controllerType != .classicPro, skin.skinType == .default {
+ } else if controllerType.usesWiimoteSkin, skin.skinType == .default {
PlayViewController.updateSkin()
}
}
- LibretroCore.sharedInstance().setWiiController(controllerType)
- WiiEmulatorBridge.shared.controllerType = controllerType
+ PlayViewController.updateWiiController()
resumeEmulationIfNeed()
}
} else if self == .dolphinCpuCore {
diff --git a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameListView.swift b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameListView.swift
index 9d296425..5180258c 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameListView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GameListView.swift
@@ -322,6 +322,7 @@ class GameListView: BaseView {
if self.isSelectionMode {
self.selectionMode = .normalMode
}
+ self.needToStopManufacturerFilter?()
}
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swift b/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swift
index 4c513f58..4a7447a8 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swift
@@ -25,7 +25,7 @@ class PlayViewController: GameViewController {
private let manicGame: Game
//默认加载的即时存档
private var loadSaveState: GameSaveState? = nil
- /// Jitless Flycast (DC + Naomi/Atomiswave/SystemSP). Threaded rendering lets the SH4 thread run ahead.
+ /// Jitless Flycast (DC + Naomi/Atomiswave/SystemSP).
private var isJitlessFlycast: Bool {
(manicGame.gameType == .dc || manicGame.isSegaArcade)
&& !(LibretroCore.jitAvailable() && manicGame.jit)
@@ -293,7 +293,7 @@ class PlayViewController: GameViewController {
FilesSyncManager.shared.ensureROM(for: game) { error in
UIView.hideLoading()
if error == nil, game.isRomExtsts {
- UIView.makeToast(message: R.string.localizable.loadRomSuccess(game.displayName))
+ startGame(game: game, saveState: saveState)
} else if FilesSyncManager.shared.romAvailability(for: game) == .syncing {
if availability != .syncing {
UIView.makeToast(message: R.string.localizable.iCloudROMStillSyncing())
@@ -977,7 +977,7 @@ class PlayViewController: GameViewController {
self.view.setNeedsLayout()
}) { [weak self] _ in
guard let self = self else { return }
- self.update3DSMotionRotation()
+ self.updateMotionRotation()
self.updateSkin()
self.view.setNeedsLayout()
self.resumeEmulationAndHandleAudio()
@@ -1937,7 +1937,7 @@ extension PlayViewController {
.citra_use_cpu_jit: "disabled",
.citra_use_default_aes_key: manicGame.isAzaharArticBase || manicGame.isArticBaseHomeMenu || manicGame.is3DSHomeMenuGame ? "enabled" : "disabled",
.citra_required_online_lle_modules: manicGame.isArticBaseHomeMenu ? "enabled" : "disabled",
- .citra_motion_rotation: Self.citraMotionRotationValue()
+ .citra_motion_rotation: Self.motionRotationValue()
], safeMode: true)
// Never start Azahar with fast-forward; it can crash on boot.
Game.change { realm in
@@ -1973,7 +1973,8 @@ extension PlayViewController {
])
LibretroCore.sharedInstance().setLibretroLogMonitor(true)
} else if manicGame.isDolphinCore {
- updateLibretroCoreConfigs(core: .Dolphin, configs: [.dolphin_language: "1"])
+ updateLibretroCoreConfigs(core: .Dolphin, configs: [.dolphin_language: "1",
+ .dolphin_motion_rotation: Self.motionRotationValue()])
} else if manicGame.gameType == .amiga {
LibretroCore.sharedInstance().setLibretroLogMonitor(true)
} else if manicGame.gameType == .wsc {
@@ -2236,7 +2237,7 @@ extension PlayViewController {
.citra_use_cpu_jit: enableJIT ? "enabled" : "disabled",
.citra_use_default_aes_key: manicGame.isAzaharArticBase || manicGame.isArticBaseHomeMenu || manicGame.is3DSHomeMenuGame ? "enabled" : "disabled",
.citra_required_online_lle_modules: enableLLE ? "enabled" : "disabled",
- .citra_motion_rotation: Self.citraMotionRotationValue()
+ .citra_motion_rotation: Self.motionRotationValue()
])
// Never start Azahar with fast-forward; it can crash on boot.
Game.change { realm in
@@ -2290,12 +2291,11 @@ extension PlayViewController {
} else {
enableManicInterpreter = manicGame.getExtraBool(key: ExtraKey.dolphinManicInterpreter.rawValue) ?? true
}
- //4: JITARM64 5: Cached Interpreter 6: Manic Interpreter
-
updateLibretroCoreConfigs(core: .Dolphin, configs: [
- .dolphin_cpu_core: enableJIT ? "4" : (enableManicInterpreter ? "6" : "5"),
+ .dolphin_cpu_core: enableJIT ? "4" : (enableManicInterpreter ? "6" : "5"), //4: JITARM64 5: Cached Interpreter 6: Manic Interpreter
.dolphin_cheats_enabled: isHardcoreMode ? "disabled" : "enabled",
- .dolphin_language: "\(manicGame.region)"
+ .dolphin_language: "\(manicGame.region)",
+ .dolphin_motion_rotation: Self.motionRotationValue()
])
} else if manicGame.gameType == .amiga {
LibretroCore.sharedInstance().setLibretroLogMonitor(true)
@@ -2467,7 +2467,7 @@ extension PlayViewController {
}
if manicGame.gameType == .wii,
let controllerType = LibretroWiiController(rawValue: manicGame.getExtraInt(key: ExtraKey.wiiController.rawValue) ?? 0),
- controllerType != .classicPro,
+ controllerType.usesWiimoteSkin,
let wiimoteSkin = Database.realm.objects(Skin.self).where({
$0.identifier == R.Strings.WiimoteSkinIdentifier }).first,
let wiimoteControllerSkin = ControllerSkin(fileURL: wiimoteSkin.fileURL) {
@@ -2537,8 +2537,8 @@ extension PlayViewController {
}
}
- /// Azahar / Citra motion rotation: 0 portrait, 1 landscapeLeft, 2 upside down, 3 landscapeRight.
- private static func citraMotionRotationValue(
+ /// Azahar / Citra / Wii motion rotation: 0 portrait, 1 landscapeLeft, 2 upside down, 3 landscapeRight.
+ private static func motionRotationValue(
for orientation: UIInterfaceOrientation = UIDevice.currentOrientation
) -> String {
switch orientation {
@@ -2555,8 +2555,8 @@ extension PlayViewController {
}
}
- private func update3DSMotionRotation() {
- let value = Self.citraMotionRotationValue()
+ private func updateMotionRotation() {
+ let value = Self.motionRotationValue()
if manicGame.isAzahar3DS {
LibretroCore.sharedInstance().updateRunningCoreConfigs(
[SpecialCoreOption.citra_motion_rotation.rawValue: value],
@@ -2564,6 +2564,11 @@ extension PlayViewController {
)
} else if manicGame.isCitra3DS {
citraCore?.applyCurrentMotionRotation()
+ } else if manicGame.gameType == .wii {
+ LibretroCore.sharedInstance().updateRunningCoreConfigs(
+ [SpecialCoreOption.dolphin_motion_rotation.rawValue: value],
+ flush: false
+ )
}
}
@@ -2936,6 +2941,9 @@ extension PlayViewController {
} else if manicGame.gameType == .symbian {
controllerView.allowTapThroughIfButtonNotHit = true
ExternalGameControllerManager.shared.isKeyboardInputEnabled = false
+ } else if manicGame.gameType == .wii {
+ // Empty overlay falls through to CocoaView POINTER (Wii IR).
+ controllerView.allowTapThroughIfButtonNotHit = true
}
if let gameMetalView {
@@ -3061,7 +3069,7 @@ extension PlayViewController {
}
DispatchQueue.main.asyncAfter(delay: 0.5) { [weak self] in
- guard let self = self else { return }
+ guard let self else { return }
self.gameMetalView?.isHidden = false
self.updateFilter()
self.updateAirPlay()
@@ -3072,10 +3080,7 @@ extension PlayViewController {
LibretroCore.sharedInstance().startWFCStatusMonitor()
}
} else if manicGame.gameType == .wii {
- let wiiController = manicGame.getExtraInt(key: ExtraKey.wiiController.rawValue) ?? 0
- let controllerType = LibretroWiiController(rawValue: wiiController) ?? .classicPro
- LibretroCore.sharedInstance().setWiiController(controllerType)
- WiiEmulatorBridge.shared.controllerType = controllerType
+ self.updateWiiController()
}
DispatchQueue.main.asyncAfter(delay: 2.5) {
self.updateFastforward(speed: self.manicGame.speed)
@@ -3581,6 +3586,9 @@ extension PlayViewController {
} else if manicGame.isLibretroType {
LibretroCore.sharedInstance().reload()
updateFilter()
+ if manicGame.gameType == .wii {
+ updateWiiController()
+ }
} else if manicGame.isJGenesisCore {
jGenesisCore?.reset()
} else if manicGame.isJ2MECore {
@@ -4430,6 +4438,14 @@ extension PlayViewController {
}
}
}
+
+ private func updateWiiController() {
+ guard manicGame.gameType == .wii else { return }
+ let wiiController = manicGame.getExtraInt(key: ExtraKey.wiiController.rawValue) ?? 0
+ let controllerType = LibretroWiiController(rawValue: wiiController) ?? .classicPro
+ LibretroCore.sharedInstance().setWiiController(controllerType)
+ WiiEmulatorBridge.shared.controllerType = controllerType
+ }
}
//MARK: GameViewControllerDelegate代理
@@ -4732,4 +4748,10 @@ extension PlayViewController {
currentPlayViewController.ndsLidToggle()
}
}
+
+ static func updateWiiController() {
+ if let currentPlayViewController {
+ currentPlayViewController.updateWiiController()
+ }
+ }
}
diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/iCloudSettingView.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/iCloudSettingView.swift
index 6e5915ad..7f882053 100644
--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/iCloudSettingView.swift
+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/iCloudSettingView.swift
@@ -23,6 +23,8 @@ class ICloudSettingView: BaseView {
private let showClose: Bool
private var iCloudDriveSyncChangeNotification: Any?
+ private static var cachedContainerSizeText: String?
+ private var containerSizeWorkItem: DispatchWorkItem?
private lazy var listPageView: ASListPageView = {
let view = ASListPageView(getListPage())
@@ -33,6 +35,7 @@ class ICloudSettingView: BaseView {
}()
deinit {
+ containerSizeWorkItem?.cancel()
if let iCloudDriveSyncChangeNotification {
NotificationCenter.default.removeObserver(iCloudDriveSyncChangeNotification)
}
@@ -100,7 +103,7 @@ class ICloudSettingView: BaseView {
pageInsets: .insets(top: showClose ? R.Size.SheetGrabberTopInset : R.Size.ContentInsetTop))
}
- private func masterCell() -> ASListPage.Cell {
+ private func masterCell(refreshSize: Bool = true) -> ASListPage.Cell {
let enabled = Settings.defalut.iCloudSyncEnable
let state: ASSwitch.State
if !PurchaseManager.isMember {
@@ -110,10 +113,9 @@ class ICloudSettingView: BaseView {
}
let detail: String
if enabled && PurchaseManager.isMember {
- if let iCloudPath = FileManager.default.url(forUbiquityContainerIdentifier: nil)?.path {
- detail = FileType.humanReadableFileSize(CacheManager.folderSize(atPath: iCloudPath)) ?? R.string.localizable.iCloudSynced()
- } else {
- detail = R.string.localizable.iCloudSynced()
+ detail = Self.cachedContainerSizeText ?? R.string.localizable.iCloudSynced()
+ if refreshSize {
+ refreshContainerSizeIfNeeded()
}
} else {
detail = R.string.localizable.iCloudNotEnable()
@@ -125,6 +127,22 @@ class ICloudSettingView: BaseView {
enablePressEffect: false)
}
+ private func refreshContainerSizeIfNeeded() {
+ guard let iCloudPath = FileManager.default.url(forUbiquityContainerIdentifier: nil)?.path else { return }
+ containerSizeWorkItem?.cancel()
+ let work = DispatchWorkItem { [weak self] in
+ let text = FileType.humanReadableFileSize(CacheManager.folderSize(atPath: iCloudPath)) ?? R.string.localizable.iCloudSynced()
+ DispatchQueue.main.async {
+ guard let self else { return }
+ guard Self.cachedContainerSizeText != text else { return }
+ Self.cachedContainerSizeText = text
+ self.listPageView.updateCellData(self.masterCell(refreshSize: false), indexPath: IndexPath(row: 0, section: 0))
+ }
+ }
+ containerSizeWorkItem = work
+ DispatchQueue.global(qos: .utility).async(execute: work)
+ }
+
private func progressCell(_ progress: FilesSyncProgress) -> ASListPage.Cell {
let title: String
switch progress.phase {
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Cores/Wii.swift b/ManicEmu/ManicEmu/Sources/Tools/Cores/Wii.swift
index 1b561fd6..2981dd1f 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Cores/Wii.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Cores/Wii.swift
@@ -141,7 +141,7 @@ class WiiEmulatorBridge : EmulatorBridgeBase {
} else if input == WiiGameInput.rightThumbstickLeft || input == WiiGameInput.rightThumbstickRight {
rightThumbstickPosition.x = input == WiiGameInput.rightThumbstickRight ? value : -value
LibretroCore.sharedInstance().moveStick(false, x: rightThumbstickPosition.x, y: rightThumbstickPosition.y, playerIndex: UInt32(playerIndex))
- } else {
+ } else {
if let gameInput = WiiGameInput(rawValue: input),
let libretroButton = gameInputToCoreInput(gameInput: gameInput) {
#if DEBUG
@@ -154,7 +154,7 @@ Log.debug("🎮 \(objectInfo(self)) 点击了:\(gameInput)")
func gameInputToCoreInput(gameInput: WiiGameInput) -> LibretroButton? {
switch controllerType {
- case .wiimote:
+ case .wiimote, .wiimoteMotionPlus:
if gameInput == .a { return .A }
else if gameInput == .b { return .B }
else if gameInput == .x { return .Y }
@@ -168,7 +168,7 @@ Log.debug("🎮 \(objectInfo(self)) 点击了:\(gameInput)")
else if gameInput == .c { return .R2 } //shake
else if gameInput == .z { return .R3 } //home
- case .wiimoteSideways:
+ case .wiimoteSideways, .wiimoteMotionPlusSideways:
if gameInput == .a { return .X }
else if gameInput == .b { return .Y }
else if gameInput == .x { return .A }
@@ -182,7 +182,7 @@ Log.debug("🎮 \(objectInfo(self)) 点击了:\(gameInput)")
else if gameInput == .c { return .R2 } //shake
else if gameInput == .z { return .R3 } //home
- case .wiimoteNunchuk:
+ case .wiimoteNunchuk, .wiimoteMotionPlusNunchuk:
if gameInput == .a { return .A }
else if gameInput == .b { return .B }
else if gameInput == .x { return .select }
@@ -199,6 +199,60 @@ Log.debug("🎮 \(objectInfo(self)) 点击了:\(gameInput)")
else if gameInput == .r2 { return .R2 } //Shake Wiimote
else if gameInput == .r3 { return .R3 } //home
+ case .classic, .wiimoteMotionPlusClassic:
+ if gameInput == .a { return .A }
+ else if gameInput == .b { return .B }
+ else if gameInput == .x { return .X }
+ else if gameInput == .y { return .Y }
+ else if gameInput == .start { return .start }
+ else if gameInput == .select { return .select }
+ else if gameInput == .up { return .up }
+ else if gameInput == .down { return .down }
+ else if gameInput == .left { return .left }
+ else if gameInput == .right { return .right }
+ else if gameInput == .l1 { return .L2 }
+ else if gameInput == .r1 { return .R2 }
+ else if gameInput == .l2 { return .L1 }
+ else if gameInput == .r2 { return .R1 }
+ else if gameInput == .l3 { return .L3 }
+ else if gameInput == .r3 { return .R3 }
+
+ case .classicPro, .wiimoteMotionPlusClassicPro:
+ if gameInput == .a { return .A }
+ else if gameInput == .b { return .B }
+ else if gameInput == .x { return .X }
+ else if gameInput == .y { return .Y }
+ else if gameInput == .start { return .start }
+ else if gameInput == .select { return .select }
+ else if gameInput == .up { return .up }
+ else if gameInput == .down { return .down }
+ else if gameInput == .left { return .left }
+ else if gameInput == .right { return .right }
+ else if gameInput == .l1 { return .L1 }
+ else if gameInput == .r1 { return .R1 }
+ else if gameInput == .l2 { return .L2 }
+ else if gameInput == .r2 { return .R2 }
+ else if gameInput == .l3 { return .L3 }
+ else if gameInput == .r3 { return .R3 }
+
+ case .gameCube:
+ if gameInput == .a { return .A }
+ else if gameInput == .b { return .B }
+ else if gameInput == .x { return .X }
+ else if gameInput == .y { return .Y }
+ else if gameInput == .start { return .start }
+ else if gameInput == .select { return nil }
+ else if gameInput == .up { return .up }
+ else if gameInput == .down { return .down }
+ else if gameInput == .left { return .left }
+ else if gameInput == .right { return .right }
+ else if gameInput == .l1 { return .L2 }
+ else if gameInput == .r1 { return .R2 }
+ else if gameInput == .l2 { return .R1 }
+ else if gameInput == .r2 { return .R1 }
+ else if gameInput == .l3 { return .L3 }
+ else if gameInput == .r3 { return .R3 }
+
default:
if gameInput == .a { return .A }
else if gameInput == .b { return .B }
@@ -242,3 +296,16 @@ Log.debug("🎮 \(objectInfo(self)) 点击了:\(gameInput)")
}
}
}
+
+extension LibretroWiiController {
+ /// Classic / GC pads keep the default Wii skin; Wiimote-style devices use the Wiimote skin.
+ var usesWiimoteSkin: Bool {
+ switch self {
+ case .wiimote, .wiimoteSideways, .wiimoteNunchuk,
+ .wiimoteMotionPlus, .wiimoteMotionPlusSideways, .wiimoteMotionPlusNunchuk:
+ return true
+ default:
+ return false
+ }
+ }
+}
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Extensions/UIDeviceExtensions.swift b/ManicEmu/ManicEmu/Sources/Tools/Extensions/UIDeviceExtensions.swift
index 1db7e5c8..c7f03b3f 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Extensions/UIDeviceExtensions.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Extensions/UIDeviceExtensions.swift
@@ -284,7 +284,13 @@ enum OrientationLockPin {
private static var lastDevicePortraitWhileHolding = false
static var isPinned: Bool { holdingLandscape }
- static var prefersLocked: Bool { holdingLandscape }
+ /// Only during Control Center portrait-lock fighting a landscape UI.
+ /// Returning true whenever we are in landscape locks iOS 26 and blocks rotating back.
+ static var prefersLocked: Bool {
+ guard holdingLandscape else { return false }
+ let device = UIDevice.current.orientation
+ return device.isPortrait || device.isFlat
+ }
static func start() {
guard !started else { return }
@@ -338,23 +344,18 @@ enum OrientationLockPin {
}
}
- /// If Control Center already started a portrait transition, push landscape back.
+ /// Fight a Control Center snap to portrait only. A real portrait hold must go through.
static func resistPortraitTransitionIfNeeded(to size: CGSize) {
guard UIDevice.isPhone, !UIDevice.isMac else { return }
guard size.height > size.width else { return }
- guard physicalAttitude() != .flat else { return }
- let before = holdingLandscape
+ guard physicalAttitude() == .landscape else { return }
_ = resolvedMask(for: ApplicationSceneDelegate.applicationWindow)
- if holdingLandscape || before {
+ if holdingLandscape {
applyMaskChange()
}
}
private static func handlePhysicalChange() {
- let attitude = physicalAttitude()
- if attitude == .flat || attitude == .unknown {
- return
- }
let before = holdingLandscape
_ = resolvedMask(for: ApplicationSceneDelegate.applicationWindow)
let devicePortrait = UIDevice.current.orientation.isPortrait
@@ -374,24 +375,50 @@ enum OrientationLockPin {
}
private static func applyMaskChange() {
- let window = ApplicationSceneDelegate.applicationWindow
- let root = window?.rootViewController
+ notifyOrientationControllers()
if #available(iOS 16.0, *) {
- root?.setNeedsUpdateOfSupportedInterfaceOrientations()
- if holdingLandscape, let scene = ApplicationSceneDelegate.applicationScene {
- scene.requestGeometryUpdate(UIWindowScene.GeometryPreferences.iOS(interfaceOrientations: preferredLandscapeMask()))
+ if let scene = ApplicationSceneDelegate.applicationScene {
+ scene.requestGeometryUpdate(UIWindowScene.GeometryPreferences.iOS(interfaceOrientations: geometryTargetMask()))
}
} else if holdingLandscape {
UIDevice.current.setValue(preferredInterfaceOrientation().rawValue, forKey: "orientation")
}
- if #available(iOS 26.0, *) {
- root?.setNeedsUpdateOfPrefersInterfaceOrientationLocked()
- }
if !holdingLandscape {
UIViewController.attemptRotationToDeviceOrientation()
}
}
+ /// PlayViewController is presented on top of Home; iOS 26 reads the visible VC.
+ private static func notifyOrientationControllers() {
+ var vc = ApplicationSceneDelegate.applicationWindow?.rootViewController
+ while let current = vc {
+ if #available(iOS 16.0, *) {
+ current.setNeedsUpdateOfSupportedInterfaceOrientations()
+ }
+ if #available(iOS 26.0, *) {
+ current.setNeedsUpdateOfPrefersInterfaceOrientationLocked()
+ }
+ vc = current.presentedViewController
+ }
+ }
+
+ private static func geometryTargetMask() -> UIInterfaceOrientationMask {
+ let allowed = AppDelegate.orientation
+ if holdingLandscape {
+ return preferredLandscapeMask()
+ }
+ switch physicalAttitude() {
+ case .portrait:
+ let portrait = allowed.intersection(.portrait)
+ return portrait.isEmpty ? allowed : portrait
+ case .landscape:
+ let landscape = allowed.intersection(.landscape)
+ return landscape.isEmpty ? allowed : landscape
+ default:
+ return allowed
+ }
+ }
+
private static func startAccelerometerIfNeeded() {
guard motion.isAccelerometerAvailable, !motion.isAccelerometerActive else { return }
motion.accelerometerUpdateInterval = 0.1
@@ -407,7 +434,7 @@ enum OrientationLockPin {
return interface.isLandscape
}
- /// Z-dominant = lying on a desk (x/y leftover from an unlevel surface is ignored).
+ /// Desk / face-up only. A reclined gaming grip must still count as portrait or landscape.
private static func physicalAttitude() -> PhysicalAttitude {
guard let acceleration = motion.accelerometerData?.acceleration else {
return lastPhysicalLandscape.map { $0 ? .landscape : .portrait } ?? .unknown
@@ -415,7 +442,7 @@ enum OrientationLockPin {
let ax = abs(acceleration.x)
let ay = abs(acceleration.y)
let az = abs(acceleration.z)
- if az > 0.65 && az >= max(ax, ay) {
+ if az > 0.85 && ax < 0.35 && ay < 0.35 {
return .flat
}
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Others/ResourcesKit.swift b/ManicEmu/ManicEmu/Sources/Tools/Others/ResourcesKit.swift
index a6dedbf1..fd0c1a48 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Others/ResourcesKit.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Others/ResourcesKit.swift
@@ -198,6 +198,13 @@ struct ResourcesKit {
try? FileManager.safeRemoveItem(at: URL(fileURLWithPath: R.Path.Assets.appendingPathComponent("iphone_background.png")))
try? FileManager.safeRemoveItem(at: URL(fileURLWithPath: R.Path.Assets.appendingPathComponent("ipad_background.png")))
}
+
+ //update psp fonts
+ if systemCoreVersionNumber < 201 {
+ try? FileManager.safeCopyItem(at: URL(fileURLWithPath: R.Path.Resource.appendingPathComponent("Libretro/system/PPSSPP/flash0/font/jpn0.pgf")),
+ to: URL(fileURLWithPath: R.Path.Document.appendingPathComponent("PPSSPP/PSP/NAND/flash0/font/jpn0.pgf")),
+ shouldReplace: true)
+ }
}
Log.info("资源解压成功!")
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncEngine.swift b/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncEngine.swift
index 0ccf7beb..b7f8d756 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncEngine.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncEngine.swift
@@ -16,12 +16,56 @@ enum FilesSyncOpKind: String, Codable {
}
struct FilesSyncOp: Codable {
+ enum CodingKeys: String, CodingKey {
+ case relativePath, kind, tombstoneReason, isDirectory, isConflict, retries, token
+ }
+
var relativePath: String
var kind: FilesSyncOpKind
var tombstoneReason: FilesSyncTombstone.Reason?
- var isDirectory: Bool = false
- var isConflict: Bool = false
- var retries: Int = 0
+ var isDirectory: Bool
+ var isConflict: Bool
+ var retries: Int
+ /// Unique id so drain completion cannot drop a newer op for the same path.
+ var token: Int
+
+ init(relativePath: String,
+ kind: FilesSyncOpKind,
+ tombstoneReason: FilesSyncTombstone.Reason?,
+ isDirectory: Bool = false,
+ isConflict: Bool = false,
+ retries: Int = 0,
+ token: Int = 0) {
+ self.relativePath = relativePath
+ self.kind = kind
+ self.tombstoneReason = tombstoneReason
+ self.isDirectory = isDirectory
+ self.isConflict = isConflict
+ self.retries = retries
+ self.token = token
+ }
+
+ init(from decoder: Decoder) throws {
+ let container = try decoder.container(keyedBy: CodingKeys.self)
+ relativePath = try container.decode(String.self, forKey: .relativePath)
+ kind = try container.decode(FilesSyncOpKind.self, forKey: .kind)
+ tombstoneReason = try container.decodeIfPresent(FilesSyncTombstone.Reason.self, forKey: .tombstoneReason)
+ isDirectory = try container.decodeIfPresent(Bool.self, forKey: .isDirectory) ?? false
+ isConflict = try container.decodeIfPresent(Bool.self, forKey: .isConflict) ?? false
+ retries = try container.decodeIfPresent(Int.self, forKey: .retries) ?? 0
+ token = try container.decodeIfPresent(Int.self, forKey: .token) ?? 0
+ }
+
+ func encode(to encoder: Encoder) throws {
+ var container = encoder.container(keyedBy: CodingKeys.self)
+ try container.encode(relativePath, forKey: .relativePath)
+ try container.encode(kind, forKey: .kind)
+ try container.encodeIfPresent(tombstoneReason, forKey: .tombstoneReason)
+ try container.encode(isDirectory, forKey: .isDirectory)
+ try container.encode(isConflict, forKey: .isConflict)
+ try container.encode(retries, forKey: .retries)
+ try container.encode(token, forKey: .token)
+ }
}
private enum FilesSyncDecideAction {
@@ -37,19 +81,25 @@ final class FilesSyncEngine {
private let lock = NSLock()
private var pending: [String: FilesSyncOp] = [:]
private var deferred: [String: FilesSyncOp] = [:]
- private var inFlight: [String: FilesSyncOpKind] = [:]
+ private var inFlight: [String: FilesSyncOp] = [:]
private var drainTask: Task<Void, Never>?
private var workTail = Task<Void, Never> {}
+ private var drainGeneration = 0
+ private var workGeneration = 0
+ private var nextOpToken = 0
private let maxConcurrent = 3
private let maxRetries = 5
private var pausedForGameplay = false
private var started = false
private var latestCloudFiles: [String: FilesSyncFingerprint] = [:]
private var notDownloaded = Set<String>()
+ private var cloudListingReady = false
private var romExclusion = FilesSyncROMExclusion()
private var pendingLocalNotes: [URL] = []
+ private var pendingLocalRemovals: [URL] = []
private var pendingInventory: FilesSyncCloudInventory?
private var repairInFlight = false
+ private var lastProgressPostedAt: TimeInterval = 0
var onProgress: ((FilesSyncProgress) -> Void)?
@@ -60,7 +110,7 @@ final class FilesSyncEngine {
var hasDownloadTask: Bool {
withLock {
pending.values.contains(where: { $0.kind == .download })
- || inFlight.values.contains(where: { $0 == .download })
+ || inFlight.values.contains(where: { $0.kind == .download })
}
}
@@ -90,23 +140,52 @@ final class FilesSyncEngine {
func stop() {
Log.debug("[iCloud Sync] stop main=\(Thread.isMainThread) \(queueSummary())")
- persistQueuedOps()
- withLock {
+ let snapshot: [String: FilesSyncOp] = withLock {
started = false
+ drainGeneration += 1
+ workGeneration += 1
+ workTail = Task {}
+ drainTask = nil
+ var all = deferred
+ for (path, op) in pending {
+ all[path] = op
+ }
pending.removeAll()
deferred.removeAll()
+ inFlight.removeAll()
pendingLocalNotes.removeAll()
+ pendingLocalRemovals.removeAll()
pendingInventory = nil
repairInFlight = false
- drainTask?.cancel()
- drainTask = nil
+ return all
}
+ FilesSyncIndex.savePending(snapshot)
publish {
$0 = FilesSyncProgress()
$0.phase = .idle
}
}
+ /// Drop Drive ledger and in-memory queues after an iCloud account switch.
+ func resetForAccountChange() {
+ Log.debug("[iCloud Sync] reset ledger for account change")
+ io.resetSession()
+ FilesSyncIndex.reset()
+ withLock {
+ pending.removeAll()
+ deferred.removeAll()
+ inFlight.removeAll()
+ latestCloudFiles.removeAll()
+ notDownloaded.removeAll()
+ pendingLocalNotes.removeAll()
+ pendingLocalRemovals.removeAll()
+ pendingInventory = nil
+ cloudListingReady = false
+ nextOpToken = 0
+ repairInFlight = false
+ }
+ }
+
func setPausedForGameplay(_ paused: Bool) {
Log.debug("[iCloud Sync] gameplay pause=\(paused) \(queueSummary())")
withLock { pausedForGameplay = paused }
@@ -216,8 +295,9 @@ final class FilesSyncEngine {
}
func noteLocalRemoval(at url: URL) {
- guard isStarted else {
- Log.debug("[iCloud Sync] noteLocalRemoval ignored (not started): \(url.path)")
+ if !isStarted {
+ withLock { pendingLocalRemovals.append(url) }
+ Log.debug("[iCloud Sync] noteLocalRemoval queued (not started): \(url.path)")
return
}
Log.debug("[iCloud Sync] noteLocalRemoval \(url.path)")
@@ -298,6 +378,18 @@ final class FilesSyncEngine {
await processLocalChange(url)
}
}
+ let removals = withLock { () -> [URL] in
+ let queued = pendingLocalRemovals
+ pendingLocalRemovals.removeAll()
+ return queued
+ }
+ if !removals.isEmpty {
+ Log.debug("[iCloud Sync] flushing \(removals.count) local removals queued before bootstrap")
+ for url in removals {
+ guard isStarted else { return }
+ await processLocalRemoval(url)
+ }
+ }
Log.debug("[iCloud Sync] bootstrap end elapsed=\(String(format: "%.2f", Date().timeIntervalSince(startedAt)))s \(queueSummary())")
#endif
}
@@ -322,8 +414,14 @@ final class FilesSyncEngine {
var allCloud: [String: FilesSyncFingerprint]
if let cloudFiles {
allCloud = cloudFiles
+ withLock { cloudListingReady = true }
} else if withLock({ latestCloudFiles.isEmpty }) {
- allCloud = await io.listCloudFiles()
+ if let listed = await io.listCloudFiles() {
+ allCloud = listed
+ withLock { cloudListingReady = true }
+ } else {
+ allCloud = [:]
+ }
} else {
allCloud = withLock { latestCloudFiles }
}
@@ -403,9 +501,7 @@ final class FilesSyncEngine {
let inLedger = ledger[relative] != nil
let inCloud = cloud[relative] != nil
let intent = intents[relative]
- Log.debug("[iCloud Sync] catch-up ROM \(relative) ledger=\(inLedger) cloud=\(inCloud) intent=\(intent?.intent.debugLabel ?? "nil") gen=\(intent?.generation ?? 0) applied=\(FilesSyncIndex.appliedGeneration(for: relative)) \(describe(localFp))")
if romExclusion.contains(relative) {
- Log.debug("[iCloud Sync] catch-up ROM sync off \(relative) intent=\(intent?.intent.debugLabel ?? "nil")")
_ = decide(relativePath: relative, local: localFp, cloud: cloudKnown ? cloud[relative] : nil)
continue
}
@@ -423,7 +519,6 @@ final class FilesSyncEngine {
for (relative, intent) in intents where FilesSyncPolicy.shouldSkipOnSaveScan(relativePath: relative) {
if local[relative] != nil { continue }
if FilesSyncPolicy.shouldNeverSync(relativePath: relative) { continue }
- Log.debug("[iCloud Sync] catch-up remote ROM \(relative) intent=\(intent.intent.debugLabel) gen=\(intent.generation) cloud=\(cloud[relative] != nil) excluded=\(romExclusion.contains(relative))")
_ = decide(relativePath: relative, local: nil, cloud: cloudKnown ? cloud[relative] : nil)
}
Log.debug("[iCloud Sync] catch-up content trees considered=\(considered) untracked=\(untracked) ledgerNotInCloud=\(missingOnCloud) cloudKnown=\(cloudKnown)")
@@ -449,6 +544,7 @@ final class FilesSyncEngine {
}
private func processLocalRemoval(_ url: URL) async {
+ guard isStarted else { return }
guard let relative = FilesSyncPolicy.documentsRelativePath(from: url) else { return }
let directory = isDirectory(url) || url.hasDirectoryPath
// Local file may already be gone; still collect children from the ledger/intents.
@@ -461,7 +557,9 @@ final class FilesSyncEngine {
Log.debug("[iCloud Sync] local removal \(relative) directory=\(directory) matching=\(paths.count)")
for path in paths {
FilesSyncIntentStore.markDeleted(relativePath: path)
- enqueue(FilesSyncOp(relativePath: path, kind: .deleteCloud, tombstoneReason: .deleted, isDirectory: path == relative && directory))
+ let isDir = (path == relative && directory)
+ || paths.contains { $0 != path && $0.hasPrefix(path + "/") }
+ enqueue(FilesSyncOp(relativePath: path, kind: .deleteCloud, tombstoneReason: .deleted, isDirectory: isDir))
}
FilesSyncIndex.save()
persistQueuedOps()
@@ -469,6 +567,7 @@ final class FilesSyncEngine {
}
private func processExcludeCloudCopies(_ urls: [URL]) async {
+ guard isStarted else { return }
for url in urls {
guard let relative = FilesSyncPolicy.documentsRelativePath(from: url) else { continue }
let directory = isDirectory(url) || url.hasDirectoryPath
@@ -479,14 +578,14 @@ final class FilesSyncEngine {
paths.append(relative)
Log.debug("[iCloud Sync] exclude cloud directory \(relative) files=\(Set(paths).count)")
for path in Set(paths) {
- let generation = FilesSyncIntentStore.markExcluded(relativePath: path)
- FilesSyncIndex.setAppliedGeneration(path, generation)
- enqueue(FilesSyncOp(relativePath: path, kind: .deleteCloud, tombstoneReason: .excluded, isDirectory: path == relative && directory))
+ FilesSyncIntentStore.markExcluded(relativePath: path)
+ let isDir = (path == relative && directory)
+ || paths.contains { $0 != path && $0.hasPrefix(path + "/") }
+ enqueue(FilesSyncOp(relativePath: path, kind: .deleteCloud, tombstoneReason: .excluded, isDirectory: isDir))
}
} else {
Log.debug("[iCloud Sync] exclude cloud file \(relative)")
- let generation = FilesSyncIntentStore.markExcluded(relativePath: relative)
- FilesSyncIndex.setAppliedGeneration(relative, generation)
+ FilesSyncIntentStore.markExcluded(relativePath: relative)
enqueue(FilesSyncOp(relativePath: relative, kind: .deleteCloud, tombstoneReason: .excluded, isDirectory: false))
}
}
@@ -541,13 +640,15 @@ final class FilesSyncEngine {
}
private func handleCloudInventory(_ inventory: FilesSyncCloudInventory) async {
- let previous = withLock { () -> [String: FilesSyncFingerprint] in
+ let (previous, previousNotDownloaded) = withLock { () -> ([String: FilesSyncFingerprint], Set<String>) in
let old = latestCloudFiles
+ let oldNotDownloaded = notDownloaded
latestCloudFiles = inventory.files
notDownloaded = inventory.notDownloaded
- return old
+ cloudListingReady = true
+ return (old, oldNotDownloaded)
}
- if progress.isBusy {
+ if progress.isBusy || !inventory.uploading.isEmpty || !inventory.downloading.isEmpty {
publish { progress in
progress.currentFileName = inventory.uploading.first ?? inventory.downloading.first ?? progress.currentFileName
progress.bytesTransferred = inventory.bytesTransferred
@@ -558,37 +659,48 @@ final class FilesSyncEngine {
Log.debug("[iCloud Sync] cloud inventory stored, reconcile deferred started=\(isStarted) paused=\(withLock { pausedForGameplay })")
return
}
+ // Upload percent ticks keep size/mtime the same. Skip a full decide pass.
+ if previous == inventory.files, previousNotDownloaded == inventory.notDownloaded {
+ Log.debug("[iCloud Sync] cloud inventory progress-only files=\(inventory.files.count)")
+ return
+ }
await reconcileCloudDelta(previous: previous, inventory: inventory)
}
private func reconcileCloudDelta(previous: [String: FilesSyncFingerprint], inventory: FilesSyncCloudInventory) async {
refreshROMExclusion()
+ var changed = Set<String>()
+ if previous.isEmpty {
+ changed.formUnion(inventory.files.keys)
+ } else {
+ for (relative, cloud) in inventory.files where previous[relative] != cloud {
+ changed.insert(relative)
+ }
+ }
+ var missing = 0
+ for relative in previous.keys where inventory.files[relative] == nil {
+ changed.insert(relative)
+ }
var decided = 0
- for (relative, cloud) in inventory.files {
+ for relative in changed {
if FilesSyncPolicy.shouldNeverSync(relativePath: relative) { continue }
+ let cloud = inventory.files[relative]
+ if cloud == nil {
+ guard let intent = FilesSyncIntentStore.snapshot(relativePath: relative),
+ intent.intent == .deleted || intent.intent == .excluded,
+ FilesSyncIndex.appliedGeneration(for: relative) < intent.generation else { continue }
+ }
let localURL = FilesSyncPolicy.localURL(relativePath: relative)
let localExists = FileManager.default.fileExists(atPath: localURL.path)
- if inventory.notDownloaded.contains(relative), localExists {
+ if cloud != nil, inventory.notDownloaded.contains(relative), localExists {
continue
}
let local = localExists ? FilesSyncIndex.fingerprint(for: localURL, preferHash: false) : nil
+ if cloud == nil { missing += 1 }
_ = decide(relativePath: relative, local: local, cloud: cloud)
decided += 1
}
- // Listing gaps are unknown. Only apply an explicit newer delete/exclude intent.
- var missing = 0
- for relative in previous.keys where inventory.files[relative] == nil {
- if FilesSyncPolicy.shouldNeverSync(relativePath: relative) { continue }
- guard let intent = FilesSyncIntentStore.snapshot(relativePath: relative),
- intent.intent == .deleted || intent.intent == .excluded,
- FilesSyncIndex.appliedGeneration(for: relative) < intent.generation else { continue }
- let localURL = FilesSyncPolicy.localURL(relativePath: relative)
- let localExists = FileManager.default.fileExists(atPath: localURL.path)
- let local = localExists ? FilesSyncIndex.fingerprint(for: localURL, preferHash: false) : nil
- _ = decide(relativePath: relative, local: local, cloud: nil)
- missing += 1
- }
- Log.debug("[iCloud Sync] cloud delta decided=\(decided) intentGaps=\(missing) \(queueSummary())")
+ Log.debug("[iCloud Sync] cloud delta decided=\(decided) intentGaps=\(missing) changed=\(changed.count) \(queueSummary())")
persistQueuedOps()
pump()
}
@@ -759,7 +871,12 @@ final class FilesSyncEngine {
}
private func enqueue(_ op: FilesSyncOp) {
- withLock { pending[op.relativePath] = op }
+ withLock {
+ nextOpToken += 1
+ var stamped = op
+ stamped.token = nextOpToken
+ pending[op.relativePath] = stamped
+ }
Log.debug("[iCloud Sync] queue \(op.kind) \(op.relativePath) \(queueSummary())")
}
@@ -781,47 +898,57 @@ final class FilesSyncEngine {
}
private func drain() async {
- Log.debug("[iCloud Sync] drain begin \(queueSummary()) main=\(Thread.isMainThread)")
+ let generation = withLock { drainGeneration }
+ Log.debug("[iCloud Sync] drain begin gen=\(generation) \(queueSummary()) main=\(Thread.isMainThread)")
while true {
- if withLock({ pausedForGameplay }) {
- withLock { drainTask = nil }
+ let state = withLock { (pausedForGameplay, started, drainGeneration) }
+ if state.2 != generation {
+ Log.debug("[iCloud Sync] drain superseded gen=\(generation)")
+ break
+ }
+ if state.0 {
+ withLock { if drainGeneration == generation { drainTask = nil } }
Log.debug("[iCloud Sync] drain paused for gameplay")
publish { $0.phase = .paused }
break
}
- if !isStarted {
- withLock { drainTask = nil }
+ if !state.1 {
+ withLock { if drainGeneration == generation { drainTask = nil } }
Log.debug("[iCloud Sync] drain stopped")
break
}
let batch: [(key: String, value: FilesSyncOp)]
let remaining: Int
(batch, remaining) = withLock {
+ guard drainGeneration == generation else { return ([], pending.count) }
let ready = pending.filter { !inFlight.keys.contains($0.key) }
let next = Array(ready.prefix(maxConcurrent))
for item in next {
- inFlight[item.key] = item.value.kind
+ inFlight[item.key] = item.value
}
return (next.map { (key: $0.key, value: $0.value) }, pending.count)
}
if batch.isEmpty {
let idle = withLock { () -> Bool in
+ guard drainGeneration == generation else { return true }
let idle = inFlight.isEmpty && pending.isEmpty
if idle { drainTask = nil }
return idle
}
if idle {
Log.debug("[iCloud Sync] drain idle")
- persistQueuedOps()
- publish {
- $0.phase = .idle
- $0.completedCount = 0
- $0.totalCount = 0
- $0.currentFileName = nil
+ if withLock({ drainGeneration == generation }) {
+ persistQueuedOps()
+ publish {
+ $0.phase = .idle
+ $0.completedCount = 0
+ $0.totalCount = 0
+ $0.currentFileName = nil
+ }
}
+ break
}
- if idle { break }
Log.debug("[iCloud Sync] drain waiting for in-flight \(queueSummary())")
try? await Task.sleep(nanoseconds: 200_000_000)
continue
@@ -839,7 +966,7 @@ final class FilesSyncEngine {
await withTaskGroup(of: (String, Bool).self) { group in
for item in batch {
group.addTask { [weak self] in
- let ok = await self?.run(item.value) ?? true
+ let ok = await self?.run(item.value, drainGeneration: generation) ?? true
return (item.key, ok)
}
}
@@ -849,10 +976,11 @@ final class FilesSyncEngine {
}
let finished = withLock { () -> Int in
+ guard drainGeneration == generation else { return 0 }
var count = 0
for item in batch {
inFlight[item.key] = nil
- if completed[item.key] == true, pending[item.key]?.kind == item.value.kind {
+ if completed[item.key] == true, pending[item.key]?.token == item.value.token {
pending[item.key] = nil
count += 1
}
@@ -862,13 +990,15 @@ final class FilesSyncEngine {
Log.debug("[iCloud Sync] drain batch finished=\(finished)/\(batch.count) \(queueSummary())")
publish { $0.completedCount += finished }
}
- FilesSyncIndex.save()
- persistQueuedOps()
- Log.debug("[iCloud Sync] drain end \(queueSummary())")
+ if withLock({ drainGeneration == generation }) {
+ FilesSyncIndex.save()
+ persistQueuedOps()
+ }
+ Log.debug("[iCloud Sync] drain end gen=\(generation) \(queueSummary())")
}
/// Returns false when the op should stay queued (e.g. paused during gameplay).
- private func run(_ op: FilesSyncOp) async -> Bool {
+ private func run(_ op: FilesSyncOp, drainGeneration session: Int) async -> Bool {
if withLock({ pausedForGameplay }), op.kind == .upload || op.kind == .download {
Log.debug("[iCloud Sync] run deferred (gameplay) \(op.kind) \(op.relativePath)")
return false
@@ -877,7 +1007,11 @@ final class FilesSyncEngine {
switch op.kind {
case .upload:
guard FileManager.default.fileExists(atPath: localURL.path) else {
- Log.debug("[iCloud Sync] upload skipped (missing local): \(op.relativePath)")
+ Log.debug("[iCloud Sync] upload missing local \(op.relativePath) retry=\(op.retries)")
+ if op.retries < 2 {
+ try? await Task.sleep(nanoseconds: 300_000_000)
+ return retryOrDrop(op, drainGeneration: session)
+ }
return true
}
do {
@@ -893,7 +1027,7 @@ final class FilesSyncEngine {
} catch {
Log.debug("[iCloud Sync] Upload failed \(op.relativePath) retry=\(op.retries): \(error)")
try? await Task.sleep(nanoseconds: 400_000_000)
- return retryOrDrop(op)
+ return retryOrDrop(op, drainGeneration: session)
}
case .download:
do {
@@ -912,19 +1046,36 @@ final class FilesSyncEngine {
}
Log.debug("[iCloud Sync] Downloaded \(op.relativePath)")
} catch {
+ let localExists = FileManager.default.fileExists(atPath: localURL.path)
+ let uploadInstead = withLock {
+ cloudListingReady
+ && latestCloudFiles[op.relativePath] == nil
+ && !notDownloaded.contains(op.relativePath)
+ }
+ if localExists, uploadInstead {
+ Log.debug("[iCloud Sync] download missing on cloud, upload local instead \(op.relativePath)")
+ enqueue(FilesSyncOp(relativePath: op.relativePath, kind: .upload, tombstoneReason: nil, isConflict: op.isConflict))
+ return true
+ }
Log.debug("[iCloud Sync] Download failed \(op.relativePath) retry=\(op.retries): \(error)")
try? await Task.sleep(nanoseconds: 400_000_000)
- return retryOrDrop(op)
+ return retryOrDrop(op, drainGeneration: session)
}
case .deleteCloud:
- await io.removeCloudItem(relativePath: op.relativePath, isDirectory: op.isDirectory)
- if op.tombstoneReason == .deleted {
- FilesSyncIndex.removeFile(op.relativePath)
- }
- if let intent = FilesSyncIntentStore.snapshot(relativePath: op.relativePath) {
- FilesSyncIndex.setAppliedGeneration(op.relativePath, intent.generation)
+ do {
+ try await io.removeCloudItem(relativePath: op.relativePath, isDirectory: op.isDirectory)
+ if op.tombstoneReason == .deleted {
+ FilesSyncIndex.removeFile(op.relativePath)
+ }
+ if let intent = FilesSyncIntentStore.snapshot(relativePath: op.relativePath) {
+ FilesSyncIndex.setAppliedGeneration(op.relativePath, intent.generation)
+ }
+ Log.debug("[iCloud Sync] Deleted cloud \(op.relativePath)")
+ } catch {
+ Log.debug("[iCloud Sync] Delete cloud failed \(op.relativePath) retry=\(op.retries): \(error)")
+ try? await Task.sleep(nanoseconds: 400_000_000)
+ return retryOrDrop(op, drainGeneration: session)
}
- Log.debug("[iCloud Sync] Deleted cloud \(op.relativePath)")
case .deleteLocal:
try? FileManager.safeRemoveItem(at: localURL)
FilesSyncIndex.removeFile(op.relativePath)
@@ -936,19 +1087,36 @@ final class FilesSyncEngine {
return true
}
- private func retryOrDrop(_ op: FilesSyncOp) -> Bool {
- if op.retries < maxRetries {
- var retry = op
- retry.retries += 1
- withLock { pending[op.relativePath] = retry }
- Log.debug("[iCloud Sync] will retry \(op.kind) \(op.relativePath) (\(retry.retries)/\(maxRetries))")
+ private func retryOrDrop(_ op: FilesSyncOp, drainGeneration session: Int) -> Bool {
+ let keepQueued = withLock { () -> Bool in
+ guard drainGeneration == session else { return false }
+ if let current = pending[op.relativePath], current.token != op.token {
+ return true
+ }
+ if op.retries < maxRetries {
+ var retry = op
+ retry.retries += 1
+ pending[op.relativePath] = retry
+ return true
+ }
+ var stored = op
+ stored.retries = 0
+ if pending[op.relativePath]?.token == op.token {
+ pending[op.relativePath] = nil
+ }
+ deferred[op.relativePath] = stored
return false
}
- var stored = op
- stored.retries = 0
- withLock { deferred[op.relativePath] = stored }
- persistQueuedOps()
- Log.debug("[iCloud Sync] deferred \(op.kind) \(op.relativePath) after \(op.retries) retries")
+ if keepQueued {
+ if withLock({ pending[op.relativePath]?.token == op.token }) {
+ Log.debug("[iCloud Sync] will retry \(op.kind) \(op.relativePath) (\(op.retries + 1)/\(maxRetries))")
+ }
+ return false
+ }
+ if withLock({ drainGeneration == session && deferred[op.relativePath] != nil }) {
+ persistQueuedOps()
+ Log.debug("[iCloud Sync] deferred \(op.kind) \(op.relativePath) after \(op.retries) retries")
+ }
return true
}
@@ -1045,8 +1213,10 @@ final class FilesSyncEngine {
private func enqueueWork(_ name: String, _ body: @escaping () async -> Void) {
lock.lock()
let previous = workTail
- let next = Task.detached(priority: .utility) {
+ let generation = workGeneration
+ let next = Task.detached(priority: .utility) { [weak self] in
await previous.value
+ guard let self, self.withLock({ self.started && self.workGeneration == generation }) else { return }
Log.debug("[iCloud Sync] work begin: \(name) main=\(Thread.isMainThread)")
await body()
Log.debug("[iCloud Sync] work end: \(name)")
@@ -1075,10 +1245,20 @@ final class FilesSyncEngine {
private func publish(_ update: (inout FilesSyncProgress) -> Void) {
var next = progress
update(&next)
- if next.phase != progress.phase || next.currentFileName != progress.currentFileName || next.totalCount != progress.totalCount {
+ let phaseChanged = next.phase != progress.phase
+ if phaseChanged || next.currentFileName != progress.currentFileName || next.totalCount != progress.totalCount {
Log.debug("[iCloud Sync] progress phase=\(next.phase.rawValue) file=\(next.currentFileName ?? "-") completed=\(next.completedCount)/\(next.totalCount)")
}
progress = next
+ let shouldPost = withLock { () -> Bool in
+ let now = Date().timeIntervalSince1970
+ if phaseChanged || next.phase == .idle || now - lastProgressPostedAt >= 0.25 {
+ lastProgressPostedAt = now
+ return true
+ }
+ return false
+ }
+ guard shouldPost else { return }
DispatchQueue.main.async {
NotificationCenter.default.post(name: R.NotificationName.iCloudDriveSyncChange, object: next)
}
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncIO.swift b/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncIO.swift
index 36b7163f..d5d0909d 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncIO.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncIO.swift
@@ -31,7 +31,18 @@ final class FilesSyncIO {
return (try? await cloudDrive.directoryExists(at: RootRelativePath(path: FilesSyncPolicy.cloudRootPath(relativePath: relativePath)))) ?? false
}
+ enum FilesSyncIOError: Swift.Error {
+ case missingLocal
+ }
+
+ func resetSession() {
+ cloudDrive = nil
+ }
+
func upload(localURL: URL, relativePath: String) async throws {
+ guard FileManager.default.fileExists(atPath: localURL.path) else {
+ throw FilesSyncIOError.missingLocal
+ }
let startedAt = Date()
Log.debug("[iCloud Sync] Upload begin \(relativePath) main=\(Thread.isMainThread) bytes=\(localFileSize(localURL))")
let drive = try await resolvedDrive()
@@ -46,9 +57,19 @@ final class FilesSyncIO {
let cloudPath = RootRelativePath(path: FilesSyncPolicy.cloudRootPath(relativePath: relativePath))
if (try? await drive.fileExists(at: cloudPath)) == true {
Log.debug("[iCloud Sync] Replace existing cloud file \(relativePath)")
- try await drive.removeFile(at: cloudPath)
+ try await replaceCloudFile(drive: drive, from: localURL, at: cloudPath)
+ } else {
+ do {
+ try await drive.upload(from: localURL, to: cloudPath)
+ } catch {
+ if (try? await drive.fileExists(at: cloudPath)) == true {
+ Log.debug("[iCloud Sync] Upload collided, replacing \(relativePath)")
+ try await replaceCloudFile(drive: drive, from: localURL, at: cloudPath)
+ } else {
+ throw error
+ }
+ }
}
- try await drive.upload(from: localURL, to: cloudPath)
Log.debug("[iCloud Sync] Upload end \(relativePath) elapsed=\(String(format: "%.2f", Date().timeIntervalSince(startedAt)))s")
}
@@ -76,23 +97,33 @@ final class FilesSyncIO {
try await drive.removeDirectory(at: RootRelativePath(path: FilesSyncPolicy.cloudRootPath(relativePath: relativePath)))
}
- func removeCloudItem(relativePath: String, isDirectory: Bool) async {
+ func removeCloudItem(relativePath: String, isDirectory: Bool) async throws {
+ let drive = try await resolvedDrive()
+ let cloudPath = RootRelativePath(path: FilesSyncPolicy.cloudRootPath(relativePath: relativePath))
+ let fileExists = (try? await drive.fileExists(at: cloudPath)) ?? false
+ let directoryExists = (try? await drive.directoryExists(at: cloudPath)) ?? false
+ guard fileExists || directoryExists else { return }
do {
- if isDirectory {
- try await removeDirectory(relativePath: relativePath)
+ if isDirectory || (directoryExists && !fileExists) {
+ try await drive.removeDirectory(at: cloudPath)
} else {
- try await removeFile(relativePath: relativePath)
+ try await drive.removeFile(at: cloudPath)
}
} catch {
- Log.debug("[iCloud Sync] Failed to remove cloud item \(relativePath): \(error)")
+ let stillFile = (try? await drive.fileExists(at: cloudPath)) ?? false
+ let stillDirectory = (try? await drive.directoryExists(at: cloudPath)) ?? false
+ if stillFile || stillDirectory {
+ throw error
+ }
+ Log.debug("[iCloud Sync] Cloud item already gone \(relativePath)")
}
}
- func listCloudFiles() async -> [String: FilesSyncFingerprint] {
+ func listCloudFiles() async -> [String: FilesSyncFingerprint]? {
let startedAt = Date()
guard let drive = try? await resolvedDrive() else {
Log.debug("[iCloud Sync] listCloudFiles skipped: CloudDrive unavailable")
- return [:]
+ return nil
}
var result: [String: FilesSyncFingerprint] = [:]
await collectCloudFiles(at: RootRelativePath(path: "Documents"), drive: drive, into: &result)
@@ -180,6 +211,25 @@ final class FilesSyncIO {
.appendingPathComponent(relativePath)
}
+ private func replaceCloudFile(drive: CloudDrive, from localURL: URL, at cloudPath: RootRelativePath) async throws {
+ let staging = URL(fileURLWithPath: R.Path.Temp).appendingPathComponent(UUID().uuidString)
+ try FileManager.default.createDirectory(at: staging.deletingLastPathComponent(), withIntermediateDirectories: true)
+ try FileManager.default.copyItem(at: localURL, to: staging)
+ defer { try? FileManager.default.removeItem(at: staging) }
+ try await drive.updateFile(at: cloudPath) { destURL in
+ if FileManager.default.fileExists(atPath: destURL.path) {
+ do {
+ _ = try FileManager.default.replaceItemAt(destURL, withItemAt: staging)
+ } catch {
+ try FileManager.default.removeItem(at: destURL)
+ try FileManager.default.copyItem(at: staging, to: destURL)
+ }
+ } else {
+ try FileManager.default.copyItem(at: staging, to: destURL)
+ }
+ }
+ }
+
private func coordinateLocalReplace(from tempURL: URL, to localURL: URL) throws {
var coordinatorError: NSError?
var replaceError: NSError?
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncIndex.swift b/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncIndex.swift
index f7b1a5bb..fd98854c 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncIndex.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncIndex.swift
@@ -81,6 +81,14 @@ enum FilesSyncIndex {
lock.unlock()
}
+ static func reset() {
+ modify { $0 = FilesSyncIndexStore() }
+ try? FileManager.default.removeItem(atPath: R.Path.FilesSyncIndex)
+ try? FileManager.default.removeItem(atPath: R.Path.FilesSyncPending)
+ save()
+ Log.debug("[iCloud Sync] ledger reset")
+ }
+
static func load() {
try? FileManager.default.createDirectory(atPath: R.Path.FilesSync, withIntermediateDirectories: true)
if let data = try? Data(contentsOf: URL(fileURLWithPath: R.Path.FilesSyncIndex)),
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncManager.swift b/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncManager.swift
index 6bc56256..db7cee4f 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncManager.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncManager.swift
@@ -72,6 +72,7 @@ final class FilesSyncManager {
private var pathMonitor: NWPathMonitor?
private var networkSatisfied = false
private var intentToken: NotificationToken?
+ private let intentQueue = DispatchQueue(label: "com.aoshuang.manicemu.files-sync-intent", qos: .utility)
private(set) var progress = FilesSyncProgress()
@@ -335,9 +336,12 @@ final class FilesSyncManager {
}
func handleAccountChange() {
- guard Settings.iCloudSyncEnableValue else { return }
+ Log.debug("[iCloud Sync] Manager.handleAccountChange enabled=\(Settings.iCloudSyncEnableValue)")
+ engine.resetForAccountChange()
stop()
- start()
+ if Settings.iCloudSyncEnableValue {
+ start()
+ }
}
private func observeLifecycleIfNeeded() {
@@ -389,13 +393,14 @@ final class FilesSyncManager {
#if SIDE_LOAD
return
#else
- intentToken = Database.realm.objects(FilesSyncRecord.self).where { !$0.isDeleted }.observe { [weak self] changes in
+ intentToken = Database.realm.objects(FilesSyncRecord.self).where { !$0.isDeleted }.observe(on: intentQueue) { [weak self] changes in
guard let self else { return }
switch changes {
case .initial:
break
case .update(let collection, _, let insertions, let modifications):
var paths: [String] = []
+ paths.reserveCapacity(insertions.count + modifications.count)
for index in insertions + modifications where index < collection.count {
paths.append(collection[index].path)
}
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncRecord.swift b/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncRecord.swift
index 38696c30..4cd7aecc 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncRecord.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncRecord.swift
@@ -139,13 +139,20 @@ enum FilesSyncIntentStore {
!$0.isDeleted && $0.intent == .deleted && $0.updatedAt < cutoff
}
guard !expired.isEmpty else { return }
- let count = expired.count
+ var pruned = 0
try? realm.write {
for record in expired {
+ // Keep unapplied deletes so a later catch-up can still remove the Drive copy.
+ if FilesSyncIndex.appliedGeneration(for: record.path) < record.generation {
+ continue
+ }
record.isDeleted = true
+ pruned += 1
}
}
- Log.debug("[iCloud Sync] pruned \(count) expired delete intents")
+ if pruned > 0 {
+ Log.debug("[iCloud Sync] pruned \(pruned) expired delete intents")
+ }
}
private static func write(relativePath: String, intent: FilesSyncIntentKind, size: Int64, bump: Bool) -> Int {
diff --git a/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncWatchers.swift b/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncWatchers.swift
index a6192295..fdeb3b9c 100644
--- a/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncWatchers.swift
+++ b/ManicEmu/ManicEmu/Sources/Tools/Sync/FilesSyncWatchers.swift
@@ -19,8 +19,18 @@ struct FilesSyncCloudInventory {
final class FilesSyncWatchers: NSObject {
private let metadataQuery = NSMetadataQuery()
+ /// Query notifications and result walks stay off the main thread. Reading
+ /// ubiquitous item attributes can block on the iCloud daemon.
+ private let queryQueue: OperationQueue = {
+ let queue = OperationQueue()
+ queue.name = "com.aoshuang.manicemu.files-sync-metadata"
+ queue.maxConcurrentOperationCount = 1
+ queue.qualityOfService = .utility
+ return queue
+ }()
private var tokens: [NSObjectProtocol] = []
private var isRunning = false
+ private var emitWorkItem: DispatchWorkItem?
var onCloudInventory: ((FilesSyncCloudInventory) -> Void)?
func start() {
@@ -32,14 +42,17 @@ final class FilesSyncWatchers: NSObject {
isRunning = true
Log.debug("[iCloud Sync] metadata query start main=\(Thread.isMainThread)")
DispatchQueue.main.async { [weak self] in
- self?.configureIfNeeded()
- self?.metadataQuery.enableUpdates()
- self?.metadataQuery.start()
+ guard let self, self.isRunning else { return }
+ self.configureIfNeeded()
+ self.metadataQuery.enableUpdates()
+ self.metadataQuery.start()
}
}
func stop() {
isRunning = false
+ emitWorkItem?.cancel()
+ emitWorkItem = nil
Log.debug("[iCloud Sync] metadata query stop")
DispatchQueue.main.async { [weak self] in
self?.metadataQuery.stop()
@@ -55,25 +68,43 @@ final class FilesSyncWatchers: NSObject {
guard tokens.isEmpty else { return }
metadataQuery.searchScopes = [NSMetadataQueryUbiquitousDocumentsScope]
metadataQuery.predicate = NSPredicate(value: true)
- metadataQuery.notificationBatchingInterval = 0.5
+ metadataQuery.notificationBatchingInterval = 1
+ metadataQuery.operationQueue = queryQueue
let center = NotificationCenter.default
- let finish = center.addObserver(forName: .NSMetadataQueryDidFinishGathering, object: metadataQuery, queue: .main) { [weak self] _ in
- self?.metadataQuery.disableUpdates()
- self?.emitInventory()
- self?.metadataQuery.enableUpdates()
+ let finish = center.addObserver(forName: .NSMetadataQueryDidFinishGathering, object: metadataQuery, queue: queryQueue) { [weak self] _ in
+ self?.scheduleEmit(immediate: true)
}
- let update = center.addObserver(forName: .NSMetadataQueryDidUpdate, object: metadataQuery, queue: .main) { [weak self] _ in
- self?.emitInventory()
+ let update = center.addObserver(forName: .NSMetadataQueryDidUpdate, object: metadataQuery, queue: queryQueue) { [weak self] _ in
+ self?.scheduleEmit(immediate: false)
}
tokens = [finish, update]
}
+ private func scheduleEmit(immediate: Bool) {
+ emitWorkItem?.cancel()
+ if immediate {
+ emitWorkItem = nil
+ emitInventory()
+ return
+ }
+ let work = DispatchWorkItem { [weak self] in
+ self?.queryQueue.addOperation {
+ self?.emitInventory()
+ }
+ }
+ emitWorkItem = work
+ DispatchQueue.global(qos: .utility).asyncAfter(deadline: .now() + 0.75, execute: work)
+ }
+
private func emitInventory() {
guard isRunning else { return }
let startedAt = Date()
+ metadataQuery.disableUpdates()
+ let items = metadataQuery.results
var inventory = FilesSyncCloudInventory()
- for case let item as NSMetadataItem in metadataQuery.results {
+ inventory.files.reserveCapacity(items.count)
+ for case let item as NSMetadataItem in items {
guard let fileURL = item.value(forAttribute: NSMetadataItemURLKey) as? URL,
let relative = FilesSyncPolicy.documentsRelativePath(from: fileURL) else { continue }
if FilesSyncPolicy.shouldNeverSync(relativePath: relative) { continue }
@@ -120,6 +151,9 @@ final class FilesSyncWatchers: NSObject {
inventory.bytesTransferred += Int64(Double(size) * min(max(percent, 0), 100) / 100)
}
}
+ if isRunning {
+ metadataQuery.enableUpdates()
+ }
Log.debug("[iCloud Sync] metadata emit files=\(inventory.files.count) uploading=\(inventory.uploading.count) downloading=\(inventory.downloading.count) notDownloaded=\(inventory.notDownloaded.count) elapsed=\(String(format: "%.2f", Date().timeIntervalSince(startedAt)))s main=\(Thread.isMainThread)")
onCloudInventory?(inventory)
}
diff --git a/System.core/Libretro/system/PPSSPP/flash0/font/jpn0.pgf b/System.core/Libretro/system/PPSSPP/flash0/font/jpn0.pgf
index e9ff2e21..042af134 100644
--- a/System.core/Libretro/system/PPSSPP/flash0/font/jpn0.pgf
+++ b/System.core/Libretro/system/PPSSPP/flash0/font/jpn0.pgf
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d363cec75fecfafd1511e370e48c748c30199c694b83a4026be34d799b192917
-size 4316284
+oid sha256:90ba7e28b905ac5604511270ad10043253f0c6cf998950499e2b72fc81d465ae
+size 3289608