From c69ad8c481874efa6822a061b1e85819cfb36041 Mon Sep 17 00:00:00 2001 From: jshackles Date: Thu, 27 Aug 2020 16:24:40 -0700 Subject: [PATCH] BUILD: 0.3 --- 3do_9d81c0ec-5646-4b1a-b809-e7e61e1d3577/manifest.json | 2 +- 3do_9d81c0ec-5646-4b1a-b809-e7e61e1d3577/plugin.py | 4 ++-- 3do_9d81c0ec-5646-4b1a-b809-e7e61e1d3577/user_config.py | 1 - 3do_9d81c0ec-5646-4b1a-b809-e7e61e1d3577/version.py | 2 +- 3ds_f6acd3ed-2c31-47d6-bae4-07b6714c1e55/manifest.json | 2 +- 3ds_f6acd3ed-2c31-47d6-bae4-07b6714c1e55/plugin.py | 4 ++-- 3ds_f6acd3ed-2c31-47d6-bae4-07b6714c1e55/user_config.py | 1 - 3ds_f6acd3ed-2c31-47d6-bae4-07b6714c1e55/version.py | 2 +- README.md | 2 +- atari_830528d9-e621-48e9-8ed4-e03a4853843e/manifest.json | 2 +- atari_830528d9-e621-48e9-8ed4-e03a4853843e/plugin.py | 4 ++-- atari_830528d9-e621-48e9-8ed4-e03a4853843e/user_config.py | 1 - atari_830528d9-e621-48e9-8ed4-e03a4853843e/version.py | 2 +- dc_5d181ffd-48dc-4330-aa58-6f646e76a5c8/manifest.json | 2 +- dc_5d181ffd-48dc-4330-aa58-6f646e76a5c8/plugin.py | 4 ++-- dc_5d181ffd-48dc-4330-aa58-6f646e76a5c8/user_config.py | 1 - dc_5d181ffd-48dc-4330-aa58-6f646e76a5c8/version.py | 2 +- gb_4345afe1-a2c3-4c58-93d3-373c53a90a92/manifest.json | 2 +- gb_4345afe1-a2c3-4c58-93d3-373c53a90a92/plugin.py | 4 ++-- gb_4345afe1-a2c3-4c58-93d3-373c53a90a92/user_config.py | 1 - gb_4345afe1-a2c3-4c58-93d3-373c53a90a92/version.py | 2 +- gba_16a78ef5-fba6-4629-b83c-ef47adab5aab/manifest.json | 2 +- gba_16a78ef5-fba6-4629-b83c-ef47adab5aab/plugin.py | 4 ++-- gba_16a78ef5-fba6-4629-b83c-ef47adab5aab/user_config.py | 1 - gba_16a78ef5-fba6-4629-b83c-ef47adab5aab/version.py | 2 +- gbc_9b53fc85-af7c-4ce2-af31-0d95234d783a/manifest.json | 2 +- gbc_9b53fc85-af7c-4ce2-af31-0d95234d783a/plugin.py | 4 ++-- gbc_9b53fc85-af7c-4ce2-af31-0d95234d783a/user_config.py | 1 - gbc_9b53fc85-af7c-4ce2-af31-0d95234d783a/version.py | 2 +- jaguar_b9773549-9c20-4729-b23d-f683762ce73a/manifest.json | 2 +- jaguar_b9773549-9c20-4729-b23d-f683762ce73a/plugin.py | 4 ++-- jaguar_b9773549-9c20-4729-b23d-f683762ce73a/user_config.py | 1 - jaguar_b9773549-9c20-4729-b23d-f683762ce73a/version.py | 2 +- n64_a3824d31-c2d3-4a1a-b321-7d0764da5513/manifest.json | 2 +- n64_a3824d31-c2d3-4a1a-b321-7d0764da5513/plugin.py | 4 ++-- n64_a3824d31-c2d3-4a1a-b321-7d0764da5513/user_config.py | 1 - n64_a3824d31-c2d3-4a1a-b321-7d0764da5513/version.py | 2 +- ncube_602422b9-ced5-476e-911a-7fa0adf0f7f7/manifest.json | 2 +- ncube_602422b9-ced5-476e-911a-7fa0adf0f7f7/plugin.py | 4 ++-- ncube_602422b9-ced5-476e-911a-7fa0adf0f7f7/user_config.py | 1 - ncube_602422b9-ced5-476e-911a-7fa0adf0f7f7/version.py | 2 +- nds_4704ed29-f516-4fd8-8477-ddbcdb7cedfc/manifest.json | 2 +- nds_4704ed29-f516-4fd8-8477-ddbcdb7cedfc/plugin.py | 4 ++-- nds_4704ed29-f516-4fd8-8477-ddbcdb7cedfc/user_config.py | 1 - nds_4704ed29-f516-4fd8-8477-ddbcdb7cedfc/version.py | 2 +- nes_e2c630e1-3cbe-4dbd-9235-5e6a2d2955ad/manifest.json | 2 +- nes_e2c630e1-3cbe-4dbd-9235-5e6a2d2955ad/plugin.py | 4 ++-- nes_e2c630e1-3cbe-4dbd-9235-5e6a2d2955ad/user_config.py | 1 - nes_e2c630e1-3cbe-4dbd-9235-5e6a2d2955ad/version.py | 2 +- nwii_2d0e97ac-0406-4e5f-a85b-ab5b1a042cba/manifest.json | 2 +- nwii_2d0e97ac-0406-4e5f-a85b-ab5b1a042cba/plugin.py | 4 ++-- nwii_2d0e97ac-0406-4e5f-a85b-ab5b1a042cba/user_config.py | 1 - nwii_2d0e97ac-0406-4e5f-a85b-ab5b1a042cba/version.py | 2 +- pce_c0ffd4b8-41c3-46b8-b0f7-5f4e4bafc68a/manifest.json | 2 +- pce_c0ffd4b8-41c3-46b8-b0f7-5f4e4bafc68a/plugin.py | 4 ++-- pce_c0ffd4b8-41c3-46b8-b0f7-5f4e4bafc68a/user_config.py | 1 - pce_c0ffd4b8-41c3-46b8-b0f7-5f4e4bafc68a/version.py | 2 +- ps1_ff02c67d-5962-4e79-a3a3-928814edb270/manifest.json | 2 +- ps1_ff02c67d-5962-4e79-a3a3-928814edb270/plugin.py | 4 ++-- ps1_ff02c67d-5962-4e79-a3a3-928814edb270/user_config.py | 1 - ps1_ff02c67d-5962-4e79-a3a3-928814edb270/version.py | 2 +- ps2_50ad79eb-393c-4f95-98ce-59f095ae47ea/manifest.json | 2 +- ps2_50ad79eb-393c-4f95-98ce-59f095ae47ea/plugin.py | 4 ++-- ps2_50ad79eb-393c-4f95-98ce-59f095ae47ea/user_config.py | 1 - ps2_50ad79eb-393c-4f95-98ce-59f095ae47ea/version.py | 2 +- psp_05487532-ba29-411b-b799-784262d275bd/manifest.json | 2 +- psp_05487532-ba29-411b-b799-784262d275bd/plugin.py | 4 ++-- psp_05487532-ba29-411b-b799-784262d275bd/user_config.py | 1 - psp_05487532-ba29-411b-b799-784262d275bd/version.py | 2 +- saturn_bd6ec091-8ee0-440a-9e26-71bbf21c05af/manifest.json | 2 +- saturn_bd6ec091-8ee0-440a-9e26-71bbf21c05af/plugin.py | 4 ++-- saturn_bd6ec091-8ee0-440a-9e26-71bbf21c05af/user_config.py | 1 - saturn_bd6ec091-8ee0-440a-9e26-71bbf21c05af/version.py | 2 +- segacd_ec7197bf-a4e4-4b86-81b9-38ea7d56f3b2/manifest.json | 2 +- segacd_ec7197bf-a4e4-4b86-81b9-38ea7d56f3b2/plugin.py | 4 ++-- segacd_ec7197bf-a4e4-4b86-81b9-38ea7d56f3b2/user_config.py | 1 - segacd_ec7197bf-a4e4-4b86-81b9-38ea7d56f3b2/version.py | 2 +- segag_e3ac94e7-945e-459d-bc1e-676cff8173f9/manifest.json | 2 +- segag_e3ac94e7-945e-459d-bc1e-676cff8173f9/plugin.py | 4 ++-- segag_e3ac94e7-945e-459d-bc1e-676cff8173f9/user_config.py | 1 - segag_e3ac94e7-945e-459d-bc1e-676cff8173f9/version.py | 2 +- sms_c6689bfb-7ba4-4d24-98e3-bd2dc339926b/manifest.json | 2 +- sms_c6689bfb-7ba4-4d24-98e3-bd2dc339926b/plugin.py | 4 ++-- sms_c6689bfb-7ba4-4d24-98e3-bd2dc339926b/user_config.py | 1 - sms_c6689bfb-7ba4-4d24-98e3-bd2dc339926b/version.py | 2 +- snes_bc831044-f772-4391-8c22-529f42cb9799/manifest.json | 2 +- snes_bc831044-f772-4391-8c22-529f42cb9799/plugin.py | 4 ++-- snes_bc831044-f772-4391-8c22-529f42cb9799/user_config.py | 1 - snes_bc831044-f772-4391-8c22-529f42cb9799/version.py | 2 +- 89 files changed, 89 insertions(+), 111 deletions(-) diff --git a/3do_9d81c0ec-5646-4b1a-b809-e7e61e1d3577/manifest.json b/3do_9d81c0ec-5646-4b1a-b809-e7e61e1d3577/manifest.json index be16471..75dbaa6 100644 --- a/3do_9d81c0ec-5646-4b1a-b809-e7e61e1d3577/manifest.json +++ b/3do_9d81c0ec-5646-4b1a-b809-e7e61e1d3577/manifest.json @@ -2,7 +2,7 @@ "name": "GOG Galaxy 3DO RetroArch plugin", "platform": "3do", "guid": "9d81c0ec-5646-4b1a-b809-e7e61e1d3577", - "version": "0.1", + "version": "0.3", "description": "Galaxy Plugin to add 3DO games and start them with the RetroArch emulator", "author": "jshackles", "email": "jshackles@gmail.com", diff --git a/3do_9d81c0ec-5646-4b1a-b809-e7e61e1d3577/plugin.py b/3do_9d81c0ec-5646-4b1a-b809-e7e61e1d3577/plugin.py index d56be9b..df4bc4a 100644 --- a/3do_9d81c0ec-5646-4b1a-b809-e7e61e1d3577/plugin.py +++ b/3do_9d81c0ec-5646-4b1a-b809-e7e61e1d3577/plugin.py @@ -49,7 +49,7 @@ def update_game_cache(self): playlist_dict = json.load(playlist_json) for entry in playlist_dict["items"]: rom_path = entry["path"].split("#")[0] - if os.path.abspath(user_config.rom_path) in os.path.abspath(rom_path) and os.path.isfile(rom_path): + if os.path.isfile(rom_path): provided_name = entry["label"].split(" (")[0] game_list.append( Game( @@ -114,7 +114,7 @@ async def get_game_time(self, game_id: str, context:any): playlist_dict = json.load(playlist_json) for rom in playlist_dict["items"]: if game_id == rom["label"].split(" (")[0]: - file_path = user_config.emu_path + "/playlists/logs/" + os.path.abspath(rom["path"]).split(os.path.abspath(user_config.rom_path) + "\\")[1][:-4] + ".lrtl" + file_path = user_config.emu_path + "/playlists/logs/" + rom["path"].rsplit("\\",1)[1].rsplit("#")[0].rsplit(".",1)[0] + ".lrtl" if os.path.isfile(file_path): with open(file_path) as json_data: time_data = json.load(json_data) diff --git a/3do_9d81c0ec-5646-4b1a-b809-e7e61e1d3577/user_config.py b/3do_9d81c0ec-5646-4b1a-b809-e7e61e1d3577/user_config.py index 2b53f51..b3dd8e2 100644 --- a/3do_9d81c0ec-5646-4b1a-b809-e7e61e1d3577/user_config.py +++ b/3do_9d81c0ec-5646-4b1a-b809-e7e61e1d3577/user_config.py @@ -2,7 +2,6 @@ # example: # emu_path = "C:/Users/USERNAME/AppData/Roaming/RetroArch/ -rom_path = "" emu_path = "" # Enter your core DLL file here, be sure to include the file extension diff --git a/3do_9d81c0ec-5646-4b1a-b809-e7e61e1d3577/version.py b/3do_9d81c0ec-5646-4b1a-b809-e7e61e1d3577/version.py index 11d27f8..cce384d 100644 --- a/3do_9d81c0ec-5646-4b1a-b809-e7e61e1d3577/version.py +++ b/3do_9d81c0ec-5646-4b1a-b809-e7e61e1d3577/version.py @@ -1 +1 @@ -__version__ = '0.1' +__version__ = '0.3' diff --git a/3ds_f6acd3ed-2c31-47d6-bae4-07b6714c1e55/manifest.json b/3ds_f6acd3ed-2c31-47d6-bae4-07b6714c1e55/manifest.json index 28354df..078e5c0 100644 --- a/3ds_f6acd3ed-2c31-47d6-bae4-07b6714c1e55/manifest.json +++ b/3ds_f6acd3ed-2c31-47d6-bae4-07b6714c1e55/manifest.json @@ -2,7 +2,7 @@ "name": "GOG Galaxy Nintendo 3DS RetroArch plugin", "platform": "3ds", "guid": "f6acd3ed-2c31-47d6-bae4-07b6714c1e55", - "version": "0.1", + "version": "0.3", "description": "Galaxy Plugin to add Nintendo 3DS roms and start them with the RetroArch emulator", "author": "jshackles", "email": "jshackles@gmail.com", diff --git a/3ds_f6acd3ed-2c31-47d6-bae4-07b6714c1e55/plugin.py b/3ds_f6acd3ed-2c31-47d6-bae4-07b6714c1e55/plugin.py index 8d25ca3..16c19c9 100644 --- a/3ds_f6acd3ed-2c31-47d6-bae4-07b6714c1e55/plugin.py +++ b/3ds_f6acd3ed-2c31-47d6-bae4-07b6714c1e55/plugin.py @@ -49,7 +49,7 @@ def update_game_cache(self): playlist_dict = json.load(playlist_json) for entry in playlist_dict["items"]: rom_path = entry["path"].split("#")[0] - if os.path.abspath(user_config.rom_path) in os.path.abspath(rom_path) and os.path.isfile(rom_path): + if os.path.isfile(rom_path): provided_name = entry["label"].split(" (")[0] game_list.append( Game( @@ -114,7 +114,7 @@ async def get_game_time(self, game_id: str, context:any): playlist_dict = json.load(playlist_json) for rom in playlist_dict["items"]: if game_id == rom["label"].split(" (")[0]: - file_path = user_config.emu_path + "/playlists/logs/" + os.path.abspath(rom["path"]).split(os.path.abspath(user_config.rom_path) + "\\")[1][:-4] + ".lrtl" + file_path = user_config.emu_path + "/playlists/logs/" + rom["path"].rsplit("\\",1)[1].rsplit("#")[0].rsplit(".",1)[0] + ".lrtl" if os.path.isfile(file_path): with open(file_path) as json_data: time_data = json.load(json_data) diff --git a/3ds_f6acd3ed-2c31-47d6-bae4-07b6714c1e55/user_config.py b/3ds_f6acd3ed-2c31-47d6-bae4-07b6714c1e55/user_config.py index 16ad265..3df833b 100644 --- a/3ds_f6acd3ed-2c31-47d6-bae4-07b6714c1e55/user_config.py +++ b/3ds_f6acd3ed-2c31-47d6-bae4-07b6714c1e55/user_config.py @@ -2,7 +2,6 @@ # example: # emu_path = "C:/Users/USERNAME/AppData/Roaming/RetroArch/ -rom_path = "" emu_path = "" # Enter your core DLL file here, be sure to include the file extension diff --git a/3ds_f6acd3ed-2c31-47d6-bae4-07b6714c1e55/version.py b/3ds_f6acd3ed-2c31-47d6-bae4-07b6714c1e55/version.py index 11d27f8..cce384d 100644 --- a/3ds_f6acd3ed-2c31-47d6-bae4-07b6714c1e55/version.py +++ b/3ds_f6acd3ed-2c31-47d6-bae4-07b6714c1e55/version.py @@ -1 +1 @@ -__version__ = '0.1' +__version__ = '0.3' diff --git a/README.md b/README.md index 2aace3e..30fe20a 100644 --- a/README.md +++ b/README.md @@ -58,5 +58,5 @@ Forked from Riku55's N64 Integration Plugin: https://github.com/Riku55/galaxy-in 2. Extract the ZIP file. 3. Copy the folders to your Galaxy plugin folder (standard is: *C:\Users\USERNAME\AppData\Local\GOG.com\Galaxy\plugins\installed*) 4. For each integration, open the file *user_config.py* with an editor. -5. Add your emulator and roms path, along with your preferred core as described in the file. +5. Add your emulator path, along with your preferred core as described in the file. 6. (Re)start Galaxy 2.0 and connect the integration. \ No newline at end of file diff --git a/atari_830528d9-e621-48e9-8ed4-e03a4853843e/manifest.json b/atari_830528d9-e621-48e9-8ed4-e03a4853843e/manifest.json index ce98c9f..485da37 100644 --- a/atari_830528d9-e621-48e9-8ed4-e03a4853843e/manifest.json +++ b/atari_830528d9-e621-48e9-8ed4-e03a4853843e/manifest.json @@ -2,7 +2,7 @@ "name": "GOG Galaxy Atari 2600 RetroArch plugin", "platform": "atari", "guid": "830528d9-e621-48e9-8ed4-e03a4853843e", - "version": "0.1", + "version": "0.3", "description": "Galaxy Plugin to add Atari 2600 roms and start them with the RetroArch emulator", "author": "jshackles", "email": "jshackles@gmail.com", diff --git a/atari_830528d9-e621-48e9-8ed4-e03a4853843e/plugin.py b/atari_830528d9-e621-48e9-8ed4-e03a4853843e/plugin.py index 9d13660..408822f 100644 --- a/atari_830528d9-e621-48e9-8ed4-e03a4853843e/plugin.py +++ b/atari_830528d9-e621-48e9-8ed4-e03a4853843e/plugin.py @@ -49,7 +49,7 @@ def update_game_cache(self): playlist_dict = json.load(playlist_json) for entry in playlist_dict["items"]: rom_path = entry["path"].split("#")[0] - if os.path.abspath(user_config.rom_path) in os.path.abspath(rom_path) and os.path.isfile(rom_path): + if os.path.isfile(rom_path): provided_name = entry["label"].split(" (")[0] game_list.append( Game( @@ -114,7 +114,7 @@ async def get_game_time(self, game_id: str, context:any): playlist_dict = json.load(playlist_json) for rom in playlist_dict["items"]: if game_id == rom["label"].split(" (")[0]: - file_path = user_config.emu_path + "/playlists/logs/" + os.path.abspath(rom["path"]).split(os.path.abspath(user_config.rom_path) + "\\")[1][:-4] + ".lrtl" + file_path = user_config.emu_path + "/playlists/logs/" + rom["path"].rsplit("\\",1)[1].rsplit("#")[0].rsplit(".",1)[0] + ".lrtl" if os.path.isfile(file_path): with open(file_path) as json_data: time_data = json.load(json_data) diff --git a/atari_830528d9-e621-48e9-8ed4-e03a4853843e/user_config.py b/atari_830528d9-e621-48e9-8ed4-e03a4853843e/user_config.py index 9b90785..5d06aff 100644 --- a/atari_830528d9-e621-48e9-8ed4-e03a4853843e/user_config.py +++ b/atari_830528d9-e621-48e9-8ed4-e03a4853843e/user_config.py @@ -2,7 +2,6 @@ # example: # emu_path = "C:/Users/USERNAME/AppData/Roaming/RetroArch/ -rom_path = "" emu_path = "" # Enter your core DLL file here, be sure to include the file extension diff --git a/atari_830528d9-e621-48e9-8ed4-e03a4853843e/version.py b/atari_830528d9-e621-48e9-8ed4-e03a4853843e/version.py index 11d27f8..cce384d 100644 --- a/atari_830528d9-e621-48e9-8ed4-e03a4853843e/version.py +++ b/atari_830528d9-e621-48e9-8ed4-e03a4853843e/version.py @@ -1 +1 @@ -__version__ = '0.1' +__version__ = '0.3' diff --git a/dc_5d181ffd-48dc-4330-aa58-6f646e76a5c8/manifest.json b/dc_5d181ffd-48dc-4330-aa58-6f646e76a5c8/manifest.json index e2a3c11..632c6ce 100644 --- a/dc_5d181ffd-48dc-4330-aa58-6f646e76a5c8/manifest.json +++ b/dc_5d181ffd-48dc-4330-aa58-6f646e76a5c8/manifest.json @@ -2,7 +2,7 @@ "name": "GOG Galaxy Sega Dreamcast RetroArch plugin", "platform": "dc", "guid": "5d181ffd-48dc-4330-aa58-6f646e76a5c8", - "version": "0.1", + "version": "0.3", "description": "Galaxy Plugin to add Sega Dreamcast isos and start them with the RetroArch emulator", "author": "jshackles", "email": "jshackles@gmail.com", diff --git a/dc_5d181ffd-48dc-4330-aa58-6f646e76a5c8/plugin.py b/dc_5d181ffd-48dc-4330-aa58-6f646e76a5c8/plugin.py index e1296bb..f1e2426 100644 --- a/dc_5d181ffd-48dc-4330-aa58-6f646e76a5c8/plugin.py +++ b/dc_5d181ffd-48dc-4330-aa58-6f646e76a5c8/plugin.py @@ -49,7 +49,7 @@ def update_game_cache(self): playlist_dict = json.load(playlist_json) for entry in playlist_dict["items"]: rom_path = entry["path"].split("#")[0] - if os.path.abspath(user_config.rom_path) in os.path.abspath(rom_path) and os.path.isfile(rom_path): + if os.path.isfile(rom_path): provided_name = entry["label"].split(" (")[0] game_list.append( Game( @@ -114,7 +114,7 @@ async def get_game_time(self, game_id: str, context:any): playlist_dict = json.load(playlist_json) for rom in playlist_dict["items"]: if game_id == rom["label"].split(" (")[0]: - file_path = user_config.emu_path + "/playlists/logs/" + os.path.abspath(rom["path"]).split(os.path.abspath(user_config.rom_path) + "\\")[1][:-4] + ".lrtl" + file_path = user_config.emu_path + "/playlists/logs/" + rom["path"].rsplit("\\",1)[1].rsplit("#")[0].rsplit(".",1)[0] + ".lrtl" if os.path.isfile(file_path): with open(file_path) as json_data: time_data = json.load(json_data) diff --git a/dc_5d181ffd-48dc-4330-aa58-6f646e76a5c8/user_config.py b/dc_5d181ffd-48dc-4330-aa58-6f646e76a5c8/user_config.py index 5980f35..3d14f0e 100644 --- a/dc_5d181ffd-48dc-4330-aa58-6f646e76a5c8/user_config.py +++ b/dc_5d181ffd-48dc-4330-aa58-6f646e76a5c8/user_config.py @@ -2,7 +2,6 @@ # example: # emu_path = "C:/Users/USERNAME/AppData/Roaming/RetroArch/ -rom_path = "" emu_path = "" # Enter your core DLL file here, be sure to include the file extension diff --git a/dc_5d181ffd-48dc-4330-aa58-6f646e76a5c8/version.py b/dc_5d181ffd-48dc-4330-aa58-6f646e76a5c8/version.py index 11d27f8..cce384d 100644 --- a/dc_5d181ffd-48dc-4330-aa58-6f646e76a5c8/version.py +++ b/dc_5d181ffd-48dc-4330-aa58-6f646e76a5c8/version.py @@ -1 +1 @@ -__version__ = '0.1' +__version__ = '0.3' diff --git a/gb_4345afe1-a2c3-4c58-93d3-373c53a90a92/manifest.json b/gb_4345afe1-a2c3-4c58-93d3-373c53a90a92/manifest.json index e995295..0e3d38c 100644 --- a/gb_4345afe1-a2c3-4c58-93d3-373c53a90a92/manifest.json +++ b/gb_4345afe1-a2c3-4c58-93d3-373c53a90a92/manifest.json @@ -2,7 +2,7 @@ "name": "GOG Galaxy Nintendo Gameboy RetroArch plugin", "platform": "ngameboy", "guid": "4345afe1-a2c3-4c58-93d3-373c53a90a92", - "version": "0.1", + "version": "0.3", "description": "Galaxy Plugin to add Nintendo GameBoy roms and start them with the RetroArch emulator", "author": "jshackles", "email": "jshackles@gmail.com", diff --git a/gb_4345afe1-a2c3-4c58-93d3-373c53a90a92/plugin.py b/gb_4345afe1-a2c3-4c58-93d3-373c53a90a92/plugin.py index a25c325..272d8a4 100644 --- a/gb_4345afe1-a2c3-4c58-93d3-373c53a90a92/plugin.py +++ b/gb_4345afe1-a2c3-4c58-93d3-373c53a90a92/plugin.py @@ -49,7 +49,7 @@ def update_game_cache(self): playlist_dict = json.load(playlist_json) for entry in playlist_dict["items"]: rom_path = entry["path"].split("#")[0] - if os.path.abspath(user_config.rom_path) in os.path.abspath(rom_path) and os.path.isfile(rom_path): + if os.path.isfile(rom_path): provided_name = entry["label"].split(" (")[0] game_list.append( Game( @@ -114,7 +114,7 @@ async def get_game_time(self, game_id: str, context:any): playlist_dict = json.load(playlist_json) for rom in playlist_dict["items"]: if game_id == rom["label"].split(" (")[0]: - file_path = user_config.emu_path + "/playlists/logs/" + os.path.abspath(rom["path"]).split(os.path.abspath(user_config.rom_path) + "\\")[1][:-4] + ".lrtl" + file_path = user_config.emu_path + "/playlists/logs/" + rom["path"].rsplit("\\",1)[1].rsplit("#")[0].rsplit(".",1)[0] + ".lrtl" if os.path.isfile(file_path): with open(file_path) as json_data: time_data = json.load(json_data) diff --git a/gb_4345afe1-a2c3-4c58-93d3-373c53a90a92/user_config.py b/gb_4345afe1-a2c3-4c58-93d3-373c53a90a92/user_config.py index 634b179..98bea83 100644 --- a/gb_4345afe1-a2c3-4c58-93d3-373c53a90a92/user_config.py +++ b/gb_4345afe1-a2c3-4c58-93d3-373c53a90a92/user_config.py @@ -2,7 +2,6 @@ # example: # emu_path = "C:/Users/USERNAME/AppData/Roaming/RetroArch/ -rom_path = "" emu_path = "" # Enter your core DLL file here, be sure to include the file extension diff --git a/gb_4345afe1-a2c3-4c58-93d3-373c53a90a92/version.py b/gb_4345afe1-a2c3-4c58-93d3-373c53a90a92/version.py index 11d27f8..cce384d 100644 --- a/gb_4345afe1-a2c3-4c58-93d3-373c53a90a92/version.py +++ b/gb_4345afe1-a2c3-4c58-93d3-373c53a90a92/version.py @@ -1 +1 @@ -__version__ = '0.1' +__version__ = '0.3' diff --git a/gba_16a78ef5-fba6-4629-b83c-ef47adab5aab/manifest.json b/gba_16a78ef5-fba6-4629-b83c-ef47adab5aab/manifest.json index f106180..b5c3b85 100644 --- a/gba_16a78ef5-fba6-4629-b83c-ef47adab5aab/manifest.json +++ b/gba_16a78ef5-fba6-4629-b83c-ef47adab5aab/manifest.json @@ -2,7 +2,7 @@ "name": "GOG Galaxy Nintendo Gameboy Advance RetroArch plugin", "platform": "ngameboy", "guid": "16a78ef5-fba6-4629-b83c-ef47adab5aab", - "version": "0.1", + "version": "0.3", "description": "Galaxy Plugin to add Nintendo GameBoy Advance roms and start them with the RetroArch emulator", "author": "jshackles", "email": "jshackles@gmail.com", diff --git a/gba_16a78ef5-fba6-4629-b83c-ef47adab5aab/plugin.py b/gba_16a78ef5-fba6-4629-b83c-ef47adab5aab/plugin.py index 3576dcc..3582134 100644 --- a/gba_16a78ef5-fba6-4629-b83c-ef47adab5aab/plugin.py +++ b/gba_16a78ef5-fba6-4629-b83c-ef47adab5aab/plugin.py @@ -49,7 +49,7 @@ def update_game_cache(self): playlist_dict = json.load(playlist_json) for entry in playlist_dict["items"]: rom_path = entry["path"].split("#")[0] - if os.path.abspath(user_config.rom_path) in os.path.abspath(rom_path) and os.path.isfile(rom_path): + if os.path.isfile(rom_path): provided_name = entry["label"].split(" (")[0] game_list.append( Game( @@ -114,7 +114,7 @@ async def get_game_time(self, game_id: str, context:any): playlist_dict = json.load(playlist_json) for rom in playlist_dict["items"]: if game_id == rom["label"].split(" (")[0]: - file_path = user_config.emu_path + "/playlists/logs/" + os.path.abspath(rom["path"]).split(os.path.abspath(user_config.rom_path) + "\\")[1][:-4] + ".lrtl" + file_path = user_config.emu_path + "/playlists/logs/" + rom["path"].rsplit("\\",1)[1].rsplit("#")[0].rsplit(".",1)[0] + ".lrtl" if os.path.isfile(file_path): with open(file_path) as json_data: time_data = json.load(json_data) diff --git a/gba_16a78ef5-fba6-4629-b83c-ef47adab5aab/user_config.py b/gba_16a78ef5-fba6-4629-b83c-ef47adab5aab/user_config.py index 634b179..98bea83 100644 --- a/gba_16a78ef5-fba6-4629-b83c-ef47adab5aab/user_config.py +++ b/gba_16a78ef5-fba6-4629-b83c-ef47adab5aab/user_config.py @@ -2,7 +2,6 @@ # example: # emu_path = "C:/Users/USERNAME/AppData/Roaming/RetroArch/ -rom_path = "" emu_path = "" # Enter your core DLL file here, be sure to include the file extension diff --git a/gba_16a78ef5-fba6-4629-b83c-ef47adab5aab/version.py b/gba_16a78ef5-fba6-4629-b83c-ef47adab5aab/version.py index 11d27f8..cce384d 100644 --- a/gba_16a78ef5-fba6-4629-b83c-ef47adab5aab/version.py +++ b/gba_16a78ef5-fba6-4629-b83c-ef47adab5aab/version.py @@ -1 +1 @@ -__version__ = '0.1' +__version__ = '0.3' diff --git a/gbc_9b53fc85-af7c-4ce2-af31-0d95234d783a/manifest.json b/gbc_9b53fc85-af7c-4ce2-af31-0d95234d783a/manifest.json index d0f31fd..a3cbb71 100644 --- a/gbc_9b53fc85-af7c-4ce2-af31-0d95234d783a/manifest.json +++ b/gbc_9b53fc85-af7c-4ce2-af31-0d95234d783a/manifest.json @@ -2,7 +2,7 @@ "name": "GOG Galaxy Nintendo Gameboy Color RetroArch plugin", "platform": "ngameboy", "guid": "9b53fc85-af7c-4ce2-af31-0d95234d783a", - "version": "0.1", + "version": "0.3", "description": "Galaxy Plugin to add Nintendo GameBoy Color roms and start them with the RetroArch emulator", "author": "jshackles", "email": "jshackles@gmail.com", diff --git a/gbc_9b53fc85-af7c-4ce2-af31-0d95234d783a/plugin.py b/gbc_9b53fc85-af7c-4ce2-af31-0d95234d783a/plugin.py index 995e98d..7d86534 100644 --- a/gbc_9b53fc85-af7c-4ce2-af31-0d95234d783a/plugin.py +++ b/gbc_9b53fc85-af7c-4ce2-af31-0d95234d783a/plugin.py @@ -49,7 +49,7 @@ def update_game_cache(self): playlist_dict = json.load(playlist_json) for entry in playlist_dict["items"]: rom_path = entry["path"].split("#")[0] - if os.path.abspath(user_config.rom_path) in os.path.abspath(rom_path) and os.path.isfile(rom_path): + if os.path.isfile(rom_path): provided_name = entry["label"].split(" (")[0] game_list.append( Game( @@ -114,7 +114,7 @@ async def get_game_time(self, game_id: str, context:any): playlist_dict = json.load(playlist_json) for rom in playlist_dict["items"]: if game_id == rom["label"].split(" (")[0]: - file_path = user_config.emu_path + "/playlists/logs/" + os.path.abspath(rom["path"]).split(os.path.abspath(user_config.rom_path) + "\\")[1][:-4] + ".lrtl" + file_path = user_config.emu_path + "/playlists/logs/" + rom["path"].rsplit("\\",1)[1].rsplit("#")[0].rsplit(".",1)[0] + ".lrtl" if os.path.isfile(file_path): with open(file_path) as json_data: time_data = json.load(json_data) diff --git a/gbc_9b53fc85-af7c-4ce2-af31-0d95234d783a/user_config.py b/gbc_9b53fc85-af7c-4ce2-af31-0d95234d783a/user_config.py index 634b179..98bea83 100644 --- a/gbc_9b53fc85-af7c-4ce2-af31-0d95234d783a/user_config.py +++ b/gbc_9b53fc85-af7c-4ce2-af31-0d95234d783a/user_config.py @@ -2,7 +2,6 @@ # example: # emu_path = "C:/Users/USERNAME/AppData/Roaming/RetroArch/ -rom_path = "" emu_path = "" # Enter your core DLL file here, be sure to include the file extension diff --git a/gbc_9b53fc85-af7c-4ce2-af31-0d95234d783a/version.py b/gbc_9b53fc85-af7c-4ce2-af31-0d95234d783a/version.py index 11d27f8..cce384d 100644 --- a/gbc_9b53fc85-af7c-4ce2-af31-0d95234d783a/version.py +++ b/gbc_9b53fc85-af7c-4ce2-af31-0d95234d783a/version.py @@ -1 +1 @@ -__version__ = '0.1' +__version__ = '0.3' diff --git a/jaguar_b9773549-9c20-4729-b23d-f683762ce73a/manifest.json b/jaguar_b9773549-9c20-4729-b23d-f683762ce73a/manifest.json index f583814..25a5f60 100644 --- a/jaguar_b9773549-9c20-4729-b23d-f683762ce73a/manifest.json +++ b/jaguar_b9773549-9c20-4729-b23d-f683762ce73a/manifest.json @@ -2,7 +2,7 @@ "name": "GOG Galaxy Atari Jaguar RetroArch plugin", "platform": "jaguar", "guid": "b9773549-9c20-4729-b23d-f683762ce73a", - "version": "0.1", + "version": "0.3", "description": "Galaxy Plugin to add Atari Jaguar roms and start them with the RetroArch emulator", "author": "jshackles", "email": "jshackles@gmail.com", diff --git a/jaguar_b9773549-9c20-4729-b23d-f683762ce73a/plugin.py b/jaguar_b9773549-9c20-4729-b23d-f683762ce73a/plugin.py index 5965571..76bdef2 100644 --- a/jaguar_b9773549-9c20-4729-b23d-f683762ce73a/plugin.py +++ b/jaguar_b9773549-9c20-4729-b23d-f683762ce73a/plugin.py @@ -49,7 +49,7 @@ def update_game_cache(self): playlist_dict = json.load(playlist_json) for entry in playlist_dict["items"]: rom_path = entry["path"].split("#")[0] - if os.path.abspath(user_config.rom_path) in os.path.abspath(rom_path) and os.path.isfile(rom_path): + if os.path.isfile(rom_path): provided_name = entry["label"].split(" (")[0] game_list.append( Game( @@ -114,7 +114,7 @@ async def get_game_time(self, game_id: str, context:any): playlist_dict = json.load(playlist_json) for rom in playlist_dict["items"]: if game_id == rom["label"].split(" (")[0]: - file_path = user_config.emu_path + "/playlists/logs/" + os.path.abspath(rom["path"]).split(os.path.abspath(user_config.rom_path) + "\\")[1][:-4] + ".lrtl" + file_path = user_config.emu_path + "/playlists/logs/" + rom["path"].rsplit("\\",1)[1].rsplit("#")[0].rsplit(".",1)[0] + ".lrtl" if os.path.isfile(file_path): with open(file_path) as json_data: time_data = json.load(json_data) diff --git a/jaguar_b9773549-9c20-4729-b23d-f683762ce73a/user_config.py b/jaguar_b9773549-9c20-4729-b23d-f683762ce73a/user_config.py index b17325b..b7092fc 100644 --- a/jaguar_b9773549-9c20-4729-b23d-f683762ce73a/user_config.py +++ b/jaguar_b9773549-9c20-4729-b23d-f683762ce73a/user_config.py @@ -2,7 +2,6 @@ # example: # emu_path = "C:/Users/USERNAME/AppData/Roaming/RetroArch/ -rom_path = "" emu_path = "" # Enter your core DLL file here, be sure to include the file extension diff --git a/jaguar_b9773549-9c20-4729-b23d-f683762ce73a/version.py b/jaguar_b9773549-9c20-4729-b23d-f683762ce73a/version.py index 11d27f8..cce384d 100644 --- a/jaguar_b9773549-9c20-4729-b23d-f683762ce73a/version.py +++ b/jaguar_b9773549-9c20-4729-b23d-f683762ce73a/version.py @@ -1 +1 @@ -__version__ = '0.1' +__version__ = '0.3' diff --git a/n64_a3824d31-c2d3-4a1a-b321-7d0764da5513/manifest.json b/n64_a3824d31-c2d3-4a1a-b321-7d0764da5513/manifest.json index b3cbdf7..f3653cd 100644 --- a/n64_a3824d31-c2d3-4a1a-b321-7d0764da5513/manifest.json +++ b/n64_a3824d31-c2d3-4a1a-b321-7d0764da5513/manifest.json @@ -2,7 +2,7 @@ "name": "Galaxy n64 RetroArch plugin", "platform": "n64", "guid": "a3824d31-c2d3-4a1a-b321-7d0764da5513", - "version": "0.2", + "version": "0.3", "description": "Galaxy Plugin to add n64 roms and start them with RetroArch emulator", "author": "riku55", "email": "", diff --git a/n64_a3824d31-c2d3-4a1a-b321-7d0764da5513/plugin.py b/n64_a3824d31-c2d3-4a1a-b321-7d0764da5513/plugin.py index cdf09be..a1c4de1 100644 --- a/n64_a3824d31-c2d3-4a1a-b321-7d0764da5513/plugin.py +++ b/n64_a3824d31-c2d3-4a1a-b321-7d0764da5513/plugin.py @@ -50,7 +50,7 @@ def update_game_cache(self): playlist_dict = json.load(playlist_json) for entry in playlist_dict["items"]: rom_path = entry["path"].split("#")[0] - if os.path.abspath(user_config.rom_path) in os.path.abspath(rom_path) and os.path.isfile(rom_path): + if os.path.isfile(rom_path): provided_name = entry["label"].split(" (")[0] game_list.append( Game( @@ -115,7 +115,7 @@ async def get_game_time(self, game_id: str, context:any): playlist_dict = json.load(playlist_json) for rom in playlist_dict["items"]: if game_id == rom["label"].split(" (")[0]: - file_path = user_config.emu_path + "/playlists/logs/" + os.path.abspath(rom["path"]).split(os.path.abspath(user_config.rom_path) + "\\")[1][:-4] + ".lrtl" + file_path = user_config.emu_path + "/playlists/logs/" + rom["path"].rsplit("\\",1)[1].rsplit("#")[0].rsplit(".",1)[0] + ".lrtl" if os.path.isfile(file_path): with open(file_path) as json_data: time_data = json.load(json_data) diff --git a/n64_a3824d31-c2d3-4a1a-b321-7d0764da5513/user_config.py b/n64_a3824d31-c2d3-4a1a-b321-7d0764da5513/user_config.py index 41e01cf..db4e995 100644 --- a/n64_a3824d31-c2d3-4a1a-b321-7d0764da5513/user_config.py +++ b/n64_a3824d31-c2d3-4a1a-b321-7d0764da5513/user_config.py @@ -2,7 +2,6 @@ # example: # emu_path = "C:/Users/USERNAME/AppData/Roaming/RetroArch/ -rom_path = "" emu_path = "" # Enter your core DLL file here, be sure to include the file extension diff --git a/n64_a3824d31-c2d3-4a1a-b321-7d0764da5513/version.py b/n64_a3824d31-c2d3-4a1a-b321-7d0764da5513/version.py index b650ceb..cce384d 100644 --- a/n64_a3824d31-c2d3-4a1a-b321-7d0764da5513/version.py +++ b/n64_a3824d31-c2d3-4a1a-b321-7d0764da5513/version.py @@ -1 +1 @@ -__version__ = '0.2' +__version__ = '0.3' diff --git a/ncube_602422b9-ced5-476e-911a-7fa0adf0f7f7/manifest.json b/ncube_602422b9-ced5-476e-911a-7fa0adf0f7f7/manifest.json index a221414..0842bc3 100644 --- a/ncube_602422b9-ced5-476e-911a-7fa0adf0f7f7/manifest.json +++ b/ncube_602422b9-ced5-476e-911a-7fa0adf0f7f7/manifest.json @@ -2,7 +2,7 @@ "name": "GOG Galaxy Nintendo Gamecube RetroArch plugin", "platform": "ncube", "guid": "602422b9-ced5-476e-911a-7fa0adf0f7f7", - "version": "0.1", + "version": "0.3", "description": "Galaxy Plugin to add Nintendo Gamecube isos and start them with the RetroArch emulator", "author": "jshackles", "email": "jshackles@gmail.com", diff --git a/ncube_602422b9-ced5-476e-911a-7fa0adf0f7f7/plugin.py b/ncube_602422b9-ced5-476e-911a-7fa0adf0f7f7/plugin.py index 5f33da8..aaf736f 100644 --- a/ncube_602422b9-ced5-476e-911a-7fa0adf0f7f7/plugin.py +++ b/ncube_602422b9-ced5-476e-911a-7fa0adf0f7f7/plugin.py @@ -49,7 +49,7 @@ def update_game_cache(self): playlist_dict = json.load(playlist_json) for entry in playlist_dict["items"]: rom_path = entry["path"].split("#")[0] - if os.path.abspath(user_config.rom_path) in os.path.abspath(rom_path) and os.path.isfile(rom_path): + if os.path.isfile(rom_path): provided_name = entry["label"].split(" (")[0] game_list.append( Game( @@ -114,7 +114,7 @@ async def get_game_time(self, game_id: str, context:any): playlist_dict = json.load(playlist_json) for rom in playlist_dict["items"]: if game_id == rom["label"].split(" (")[0]: - file_path = user_config.emu_path + "/playlists/logs/" + os.path.abspath(rom["path"]).split(os.path.abspath(user_config.rom_path) + "\\")[1][:-4] + ".lrtl" + file_path = user_config.emu_path + "/playlists/logs/" + rom["path"].rsplit("\\",1)[1].rsplit("#")[0].rsplit(".",1)[0] + ".lrtl" if os.path.isfile(file_path): with open(file_path) as json_data: time_data = json.load(json_data) diff --git a/ncube_602422b9-ced5-476e-911a-7fa0adf0f7f7/user_config.py b/ncube_602422b9-ced5-476e-911a-7fa0adf0f7f7/user_config.py index d7b4bc3..8706617 100644 --- a/ncube_602422b9-ced5-476e-911a-7fa0adf0f7f7/user_config.py +++ b/ncube_602422b9-ced5-476e-911a-7fa0adf0f7f7/user_config.py @@ -2,7 +2,6 @@ # example: # emu_path = "C:/Users/USERNAME/AppData/Roaming/RetroArch/ -rom_path = "" emu_path = "" # Enter your core DLL file here, be sure to include the file extension diff --git a/ncube_602422b9-ced5-476e-911a-7fa0adf0f7f7/version.py b/ncube_602422b9-ced5-476e-911a-7fa0adf0f7f7/version.py index 11d27f8..cce384d 100644 --- a/ncube_602422b9-ced5-476e-911a-7fa0adf0f7f7/version.py +++ b/ncube_602422b9-ced5-476e-911a-7fa0adf0f7f7/version.py @@ -1 +1 @@ -__version__ = '0.1' +__version__ = '0.3' diff --git a/nds_4704ed29-f516-4fd8-8477-ddbcdb7cedfc/manifest.json b/nds_4704ed29-f516-4fd8-8477-ddbcdb7cedfc/manifest.json index 9b5d479..54b5b91 100644 --- a/nds_4704ed29-f516-4fd8-8477-ddbcdb7cedfc/manifest.json +++ b/nds_4704ed29-f516-4fd8-8477-ddbcdb7cedfc/manifest.json @@ -2,7 +2,7 @@ "name": "GOG Galaxy Nintendo DS RetroArch plugin", "platform": "nds", "guid": "4704ed29-f516-4fd8-8477-ddbcdb7cedfc", - "version": "0.1", + "version": "0.3", "description": "Galaxy Plugin to add Nintendo DS roms and start them with the RetroArch emulator", "author": "jshackles", "email": "jshackles@gmail.com", diff --git a/nds_4704ed29-f516-4fd8-8477-ddbcdb7cedfc/plugin.py b/nds_4704ed29-f516-4fd8-8477-ddbcdb7cedfc/plugin.py index 2ffd118..ec97c1c 100644 --- a/nds_4704ed29-f516-4fd8-8477-ddbcdb7cedfc/plugin.py +++ b/nds_4704ed29-f516-4fd8-8477-ddbcdb7cedfc/plugin.py @@ -49,7 +49,7 @@ def update_game_cache(self): playlist_dict = json.load(playlist_json) for entry in playlist_dict["items"]: rom_path = entry["path"].split("#")[0] - if os.path.abspath(user_config.rom_path) in os.path.abspath(rom_path) and os.path.isfile(rom_path): + if os.path.isfile(rom_path): provided_name = entry["label"].split(" (")[0] game_list.append( Game( @@ -114,7 +114,7 @@ async def get_game_time(self, game_id: str, context:any): playlist_dict = json.load(playlist_json) for rom in playlist_dict["items"]: if game_id == rom["label"].split(" (")[0]: - file_path = user_config.emu_path + "/playlists/logs/" + os.path.abspath(rom["path"]).split(os.path.abspath(user_config.rom_path) + "\\")[1][:-4] + ".lrtl" + file_path = user_config.emu_path + "/playlists/logs/" + rom["path"].rsplit("\\",1)[1].rsplit("#")[0].rsplit(".",1)[0] + ".lrtl" if os.path.isfile(file_path): with open(file_path) as json_data: time_data = json.load(json_data) diff --git a/nds_4704ed29-f516-4fd8-8477-ddbcdb7cedfc/user_config.py b/nds_4704ed29-f516-4fd8-8477-ddbcdb7cedfc/user_config.py index 6c45117..539eb5a 100644 --- a/nds_4704ed29-f516-4fd8-8477-ddbcdb7cedfc/user_config.py +++ b/nds_4704ed29-f516-4fd8-8477-ddbcdb7cedfc/user_config.py @@ -2,7 +2,6 @@ # example: # emu_path = "C:/Users/USERNAME/AppData/Roaming/RetroArch/ -rom_path = "" emu_path = "" # Enter your core DLL file here, be sure to include the file extension diff --git a/nds_4704ed29-f516-4fd8-8477-ddbcdb7cedfc/version.py b/nds_4704ed29-f516-4fd8-8477-ddbcdb7cedfc/version.py index 11d27f8..cce384d 100644 --- a/nds_4704ed29-f516-4fd8-8477-ddbcdb7cedfc/version.py +++ b/nds_4704ed29-f516-4fd8-8477-ddbcdb7cedfc/version.py @@ -1 +1 @@ -__version__ = '0.1' +__version__ = '0.3' diff --git a/nes_e2c630e1-3cbe-4dbd-9235-5e6a2d2955ad/manifest.json b/nes_e2c630e1-3cbe-4dbd-9235-5e6a2d2955ad/manifest.json index 5aedd5d..25ff115 100644 --- a/nes_e2c630e1-3cbe-4dbd-9235-5e6a2d2955ad/manifest.json +++ b/nes_e2c630e1-3cbe-4dbd-9235-5e6a2d2955ad/manifest.json @@ -2,7 +2,7 @@ "name": "GOG Galaxy NES RetroArch plugin", "platform": "nes", "guid": "e2c630e1-3cbe-4dbd-9235-5e6a2d2955ad", - "version": "0.1", + "version": "0.3", "description": "Galaxy Plugin to add NES roms and start them with the RetroArch emulator", "author": "jshackles", "email": "jshackles@gmail.com", diff --git a/nes_e2c630e1-3cbe-4dbd-9235-5e6a2d2955ad/plugin.py b/nes_e2c630e1-3cbe-4dbd-9235-5e6a2d2955ad/plugin.py index efebc67..716bbba 100644 --- a/nes_e2c630e1-3cbe-4dbd-9235-5e6a2d2955ad/plugin.py +++ b/nes_e2c630e1-3cbe-4dbd-9235-5e6a2d2955ad/plugin.py @@ -49,7 +49,7 @@ def update_game_cache(self): playlist_dict = json.load(playlist_json) for entry in playlist_dict["items"]: rom_path = entry["path"].split("#")[0] - if os.path.abspath(user_config.rom_path) in os.path.abspath(rom_path) and os.path.isfile(rom_path): + if os.path.isfile(rom_path): provided_name = entry["label"].split(" (")[0] game_list.append( Game( @@ -114,7 +114,7 @@ async def get_game_time(self, game_id: str, context:any): playlist_dict = json.load(playlist_json) for rom in playlist_dict["items"]: if game_id == rom["label"].split(" (")[0]: - file_path = user_config.emu_path + "/playlists/logs/" + os.path.abspath(rom["path"]).split(os.path.abspath(user_config.rom_path) + "\\")[1][:-4] + ".lrtl" + file_path = user_config.emu_path + "/playlists/logs/" + rom["path"].rsplit("\\",1)[1].rsplit("#")[0].rsplit(".",1)[0] + ".lrtl" if os.path.isfile(file_path): with open(file_path) as json_data: time_data = json.load(json_data) diff --git a/nes_e2c630e1-3cbe-4dbd-9235-5e6a2d2955ad/user_config.py b/nes_e2c630e1-3cbe-4dbd-9235-5e6a2d2955ad/user_config.py index 8f6cb99..8faf7e2 100644 --- a/nes_e2c630e1-3cbe-4dbd-9235-5e6a2d2955ad/user_config.py +++ b/nes_e2c630e1-3cbe-4dbd-9235-5e6a2d2955ad/user_config.py @@ -2,7 +2,6 @@ # example: # emu_path = "C:/Users/USERNAME/AppData/Roaming/RetroArch/ -rom_path = "" emu_path = "" # Enter your core DLL file here, be sure to include the file extension diff --git a/nes_e2c630e1-3cbe-4dbd-9235-5e6a2d2955ad/version.py b/nes_e2c630e1-3cbe-4dbd-9235-5e6a2d2955ad/version.py index 11d27f8..cce384d 100644 --- a/nes_e2c630e1-3cbe-4dbd-9235-5e6a2d2955ad/version.py +++ b/nes_e2c630e1-3cbe-4dbd-9235-5e6a2d2955ad/version.py @@ -1 +1 @@ -__version__ = '0.1' +__version__ = '0.3' diff --git a/nwii_2d0e97ac-0406-4e5f-a85b-ab5b1a042cba/manifest.json b/nwii_2d0e97ac-0406-4e5f-a85b-ab5b1a042cba/manifest.json index 026048d..36ea8e9 100644 --- a/nwii_2d0e97ac-0406-4e5f-a85b-ab5b1a042cba/manifest.json +++ b/nwii_2d0e97ac-0406-4e5f-a85b-ab5b1a042cba/manifest.json @@ -2,7 +2,7 @@ "name": "GOG Galaxy Nintendo Wii RetroArch plugin", "platform": "nwii", "guid": "2d0e97ac-0406-4e5f-a85b-ab5b1a042cba", - "version": "0.1", + "version": "0.3", "description": "Galaxy Plugin to add Nintendo Wii isos and start them with the RetroArch emulator", "author": "jshackles", "email": "jshackles@gmail.com", diff --git a/nwii_2d0e97ac-0406-4e5f-a85b-ab5b1a042cba/plugin.py b/nwii_2d0e97ac-0406-4e5f-a85b-ab5b1a042cba/plugin.py index 8f479c6..913d651 100644 --- a/nwii_2d0e97ac-0406-4e5f-a85b-ab5b1a042cba/plugin.py +++ b/nwii_2d0e97ac-0406-4e5f-a85b-ab5b1a042cba/plugin.py @@ -49,7 +49,7 @@ def update_game_cache(self): playlist_dict = json.load(playlist_json) for entry in playlist_dict["items"]: rom_path = entry["path"].split("#")[0] - if os.path.abspath(user_config.rom_path) in os.path.abspath(rom_path) and os.path.isfile(rom_path): + if os.path.isfile(rom_path): provided_name = entry["label"].split(" (")[0] game_list.append( Game( @@ -114,7 +114,7 @@ async def get_game_time(self, game_id: str, context:any): playlist_dict = json.load(playlist_json) for rom in playlist_dict["items"]: if game_id == rom["label"].split(" (")[0]: - file_path = user_config.emu_path + "/playlists/logs/" + os.path.abspath(rom["path"]).split(os.path.abspath(user_config.rom_path) + "\\")[1][:-4] + ".lrtl" + file_path = user_config.emu_path + "/playlists/logs/" + rom["path"].rsplit("\\",1)[1].rsplit("#")[0].rsplit(".",1)[0] + ".lrtl" if os.path.isfile(file_path): with open(file_path) as json_data: time_data = json.load(json_data) diff --git a/nwii_2d0e97ac-0406-4e5f-a85b-ab5b1a042cba/user_config.py b/nwii_2d0e97ac-0406-4e5f-a85b-ab5b1a042cba/user_config.py index d7b4bc3..8706617 100644 --- a/nwii_2d0e97ac-0406-4e5f-a85b-ab5b1a042cba/user_config.py +++ b/nwii_2d0e97ac-0406-4e5f-a85b-ab5b1a042cba/user_config.py @@ -2,7 +2,6 @@ # example: # emu_path = "C:/Users/USERNAME/AppData/Roaming/RetroArch/ -rom_path = "" emu_path = "" # Enter your core DLL file here, be sure to include the file extension diff --git a/nwii_2d0e97ac-0406-4e5f-a85b-ab5b1a042cba/version.py b/nwii_2d0e97ac-0406-4e5f-a85b-ab5b1a042cba/version.py index 11d27f8..cce384d 100644 --- a/nwii_2d0e97ac-0406-4e5f-a85b-ab5b1a042cba/version.py +++ b/nwii_2d0e97ac-0406-4e5f-a85b-ab5b1a042cba/version.py @@ -1 +1 @@ -__version__ = '0.1' +__version__ = '0.3' diff --git a/pce_c0ffd4b8-41c3-46b8-b0f7-5f4e4bafc68a/manifest.json b/pce_c0ffd4b8-41c3-46b8-b0f7-5f4e4bafc68a/manifest.json index 841a5f8..65b57d0 100644 --- a/pce_c0ffd4b8-41c3-46b8-b0f7-5f4e4bafc68a/manifest.json +++ b/pce_c0ffd4b8-41c3-46b8-b0f7-5f4e4bafc68a/manifest.json @@ -2,7 +2,7 @@ "name": "GOG Galaxy PC Engine RetroArch plugin", "platform": "pce", "guid": "c0ffd4b8-41c3-46b8-b0f7-5f4e4bafc68a", - "version": "0.1", + "version": "0.3", "description": "Galaxy Plugin to add PC Engine games and start them with the RetroArch emulator", "author": "jshackles", "email": "jshackles@gmail.com", diff --git a/pce_c0ffd4b8-41c3-46b8-b0f7-5f4e4bafc68a/plugin.py b/pce_c0ffd4b8-41c3-46b8-b0f7-5f4e4bafc68a/plugin.py index 48a9c97..3ed0819 100644 --- a/pce_c0ffd4b8-41c3-46b8-b0f7-5f4e4bafc68a/plugin.py +++ b/pce_c0ffd4b8-41c3-46b8-b0f7-5f4e4bafc68a/plugin.py @@ -49,7 +49,7 @@ def update_game_cache(self): playlist_dict = json.load(playlist_json) for entry in playlist_dict["items"]: rom_path = entry["path"].split("#")[0] - if os.path.abspath(user_config.rom_path) in os.path.abspath(rom_path) and os.path.isfile(rom_path): + if os.path.isfile(rom_path): provided_name = entry["label"].split(" (")[0] game_list.append( Game( @@ -114,7 +114,7 @@ async def get_game_time(self, game_id: str, context:any): playlist_dict = json.load(playlist_json) for rom in playlist_dict["items"]: if game_id == rom["label"].split(" (")[0]: - file_path = user_config.emu_path + "/playlists/logs/" + os.path.abspath(rom["path"]).split(os.path.abspath(user_config.rom_path) + "\\")[1][:-4] + ".lrtl" + file_path = user_config.emu_path + "/playlists/logs/" + rom["path"].rsplit("\\",1)[1].rsplit("#")[0].rsplit(".",1)[0] + ".lrtl" if os.path.isfile(file_path): with open(file_path) as json_data: time_data = json.load(json_data) diff --git a/pce_c0ffd4b8-41c3-46b8-b0f7-5f4e4bafc68a/user_config.py b/pce_c0ffd4b8-41c3-46b8-b0f7-5f4e4bafc68a/user_config.py index 7b5c4ef..26b21db 100644 --- a/pce_c0ffd4b8-41c3-46b8-b0f7-5f4e4bafc68a/user_config.py +++ b/pce_c0ffd4b8-41c3-46b8-b0f7-5f4e4bafc68a/user_config.py @@ -2,7 +2,6 @@ # example: # emu_path = "C:/Users/USERNAME/AppData/Roaming/RetroArch/ -rom_path = "" emu_path = "" # Enter your core DLL file here, be sure to include the file extension diff --git a/pce_c0ffd4b8-41c3-46b8-b0f7-5f4e4bafc68a/version.py b/pce_c0ffd4b8-41c3-46b8-b0f7-5f4e4bafc68a/version.py index 11d27f8..cce384d 100644 --- a/pce_c0ffd4b8-41c3-46b8-b0f7-5f4e4bafc68a/version.py +++ b/pce_c0ffd4b8-41c3-46b8-b0f7-5f4e4bafc68a/version.py @@ -1 +1 @@ -__version__ = '0.1' +__version__ = '0.3' diff --git a/ps1_ff02c67d-5962-4e79-a3a3-928814edb270/manifest.json b/ps1_ff02c67d-5962-4e79-a3a3-928814edb270/manifest.json index 9882b83..ba635c4 100644 --- a/ps1_ff02c67d-5962-4e79-a3a3-928814edb270/manifest.json +++ b/ps1_ff02c67d-5962-4e79-a3a3-928814edb270/manifest.json @@ -2,7 +2,7 @@ "name": "GOG Galaxy PS1 RetroArch plugin", "platform": "psx", "guid": "ff02c67d-5962-4e79-a3a3-928814edb270", - "version": "0.1", + "version": "0.3", "description": "Galaxy Plugin to add PS1 isos and start them with the RetroArch emulator", "author": "jshackles", "email": "jshackles@gmail.com", diff --git a/ps1_ff02c67d-5962-4e79-a3a3-928814edb270/plugin.py b/ps1_ff02c67d-5962-4e79-a3a3-928814edb270/plugin.py index b62ad82..ef9d30a 100644 --- a/ps1_ff02c67d-5962-4e79-a3a3-928814edb270/plugin.py +++ b/ps1_ff02c67d-5962-4e79-a3a3-928814edb270/plugin.py @@ -49,7 +49,7 @@ def update_game_cache(self): playlist_dict = json.load(playlist_json) for entry in playlist_dict["items"]: rom_path = entry["path"].split("#")[0] - if os.path.abspath(user_config.rom_path) in os.path.abspath(rom_path) and os.path.isfile(rom_path): + if os.path.isfile(rom_path): provided_name = entry["label"].split(" (")[0] game_list.append( Game( @@ -114,7 +114,7 @@ async def get_game_time(self, game_id: str, context:any): playlist_dict = json.load(playlist_json) for rom in playlist_dict["items"]: if game_id == rom["label"].split(" (")[0]: - file_path = user_config.emu_path + "/playlists/logs/" + os.path.abspath(rom["path"]).split(os.path.abspath(user_config.rom_path) + "\\")[1][:-4] + ".lrtl" + file_path = user_config.emu_path + "/playlists/logs/" + rom["path"].rsplit("\\",1)[1].rsplit("#")[0].rsplit(".",1)[0] + ".lrtl" if os.path.isfile(file_path): with open(file_path) as json_data: time_data = json.load(json_data) diff --git a/ps1_ff02c67d-5962-4e79-a3a3-928814edb270/user_config.py b/ps1_ff02c67d-5962-4e79-a3a3-928814edb270/user_config.py index 2b53f51..b3dd8e2 100644 --- a/ps1_ff02c67d-5962-4e79-a3a3-928814edb270/user_config.py +++ b/ps1_ff02c67d-5962-4e79-a3a3-928814edb270/user_config.py @@ -2,7 +2,6 @@ # example: # emu_path = "C:/Users/USERNAME/AppData/Roaming/RetroArch/ -rom_path = "" emu_path = "" # Enter your core DLL file here, be sure to include the file extension diff --git a/ps1_ff02c67d-5962-4e79-a3a3-928814edb270/version.py b/ps1_ff02c67d-5962-4e79-a3a3-928814edb270/version.py index 11d27f8..cce384d 100644 --- a/ps1_ff02c67d-5962-4e79-a3a3-928814edb270/version.py +++ b/ps1_ff02c67d-5962-4e79-a3a3-928814edb270/version.py @@ -1 +1 @@ -__version__ = '0.1' +__version__ = '0.3' diff --git a/ps2_50ad79eb-393c-4f95-98ce-59f095ae47ea/manifest.json b/ps2_50ad79eb-393c-4f95-98ce-59f095ae47ea/manifest.json index b7528e6..ed06077 100644 --- a/ps2_50ad79eb-393c-4f95-98ce-59f095ae47ea/manifest.json +++ b/ps2_50ad79eb-393c-4f95-98ce-59f095ae47ea/manifest.json @@ -2,7 +2,7 @@ "name": "GOG Galaxy PS2 RetroArch plugin", "platform": "ps2", "guid": "50ad79eb-393c-4f95-98ce-59f095ae47ea", - "version": "0.1", + "version": "0.3", "description": "Galaxy Plugin to add PS2 isos and start them with the RetroArch emulator", "author": "jshackles", "email": "jshackles@gmail.com", diff --git a/ps2_50ad79eb-393c-4f95-98ce-59f095ae47ea/plugin.py b/ps2_50ad79eb-393c-4f95-98ce-59f095ae47ea/plugin.py index 02fd0a5..d20a3fa 100644 --- a/ps2_50ad79eb-393c-4f95-98ce-59f095ae47ea/plugin.py +++ b/ps2_50ad79eb-393c-4f95-98ce-59f095ae47ea/plugin.py @@ -49,7 +49,7 @@ def update_game_cache(self): playlist_dict = json.load(playlist_json) for entry in playlist_dict["items"]: rom_path = entry["path"].split("#")[0] - if os.path.abspath(user_config.rom_path) in os.path.abspath(rom_path) and os.path.isfile(rom_path): + if os.path.isfile(rom_path): provided_name = entry["label"].split(" (")[0] game_list.append( Game( @@ -114,7 +114,7 @@ async def get_game_time(self, game_id: str, context:any): playlist_dict = json.load(playlist_json) for rom in playlist_dict["items"]: if game_id == rom["label"].split(" (")[0]: - file_path = user_config.emu_path + "/playlists/logs/" + os.path.abspath(rom["path"]).split(os.path.abspath(user_config.rom_path) + "\\")[1][:-4] + ".lrtl" + file_path = user_config.emu_path + "/playlists/logs/" + rom["path"].rsplit("\\",1)[1].rsplit("#")[0].rsplit(".",1)[0] + ".lrtl" if os.path.isfile(file_path): with open(file_path) as json_data: time_data = json.load(json_data) diff --git a/ps2_50ad79eb-393c-4f95-98ce-59f095ae47ea/user_config.py b/ps2_50ad79eb-393c-4f95-98ce-59f095ae47ea/user_config.py index 2b53f51..b3dd8e2 100644 --- a/ps2_50ad79eb-393c-4f95-98ce-59f095ae47ea/user_config.py +++ b/ps2_50ad79eb-393c-4f95-98ce-59f095ae47ea/user_config.py @@ -2,7 +2,6 @@ # example: # emu_path = "C:/Users/USERNAME/AppData/Roaming/RetroArch/ -rom_path = "" emu_path = "" # Enter your core DLL file here, be sure to include the file extension diff --git a/ps2_50ad79eb-393c-4f95-98ce-59f095ae47ea/version.py b/ps2_50ad79eb-393c-4f95-98ce-59f095ae47ea/version.py index 11d27f8..cce384d 100644 --- a/ps2_50ad79eb-393c-4f95-98ce-59f095ae47ea/version.py +++ b/ps2_50ad79eb-393c-4f95-98ce-59f095ae47ea/version.py @@ -1 +1 @@ -__version__ = '0.1' +__version__ = '0.3' diff --git a/psp_05487532-ba29-411b-b799-784262d275bd/manifest.json b/psp_05487532-ba29-411b-b799-784262d275bd/manifest.json index 1eb3361..a2977a8 100644 --- a/psp_05487532-ba29-411b-b799-784262d275bd/manifest.json +++ b/psp_05487532-ba29-411b-b799-784262d275bd/manifest.json @@ -2,7 +2,7 @@ "name": "GOG Galaxy PSP RetroArch plugin", "platform": "psp", "guid": "05487532-ba29-411b-b799-784262d275bd", - "version": "0.1", + "version": "0.3", "description": "Galaxy Plugin to add PSP isos and start them with the RetroArch emulator", "author": "jshackles", "email": "jshackles@gmail.com", diff --git a/psp_05487532-ba29-411b-b799-784262d275bd/plugin.py b/psp_05487532-ba29-411b-b799-784262d275bd/plugin.py index dc1051e..ff5137d 100644 --- a/psp_05487532-ba29-411b-b799-784262d275bd/plugin.py +++ b/psp_05487532-ba29-411b-b799-784262d275bd/plugin.py @@ -49,7 +49,7 @@ def update_game_cache(self): playlist_dict = json.load(playlist_json) for entry in playlist_dict["items"]: rom_path = entry["path"].split("#")[0] - if os.path.abspath(user_config.rom_path) in os.path.abspath(rom_path) and os.path.isfile(rom_path): + if os.path.isfile(rom_path): provided_name = entry["label"].split(" (")[0] game_list.append( Game( @@ -114,7 +114,7 @@ async def get_game_time(self, game_id: str, context:any): playlist_dict = json.load(playlist_json) for rom in playlist_dict["items"]: if game_id == rom["label"].split(" (")[0]: - file_path = user_config.emu_path + "/playlists/logs/" + os.path.abspath(rom["path"]).split(os.path.abspath(user_config.rom_path) + "\\")[1][:-4] + ".lrtl" + file_path = user_config.emu_path + "/playlists/logs/" + rom["path"].rsplit("\\",1)[1].rsplit("#")[0].rsplit(".",1)[0] + ".lrtl" if os.path.isfile(file_path): with open(file_path) as json_data: time_data = json.load(json_data) diff --git a/psp_05487532-ba29-411b-b799-784262d275bd/user_config.py b/psp_05487532-ba29-411b-b799-784262d275bd/user_config.py index 68ef7fc..e58403b 100644 --- a/psp_05487532-ba29-411b-b799-784262d275bd/user_config.py +++ b/psp_05487532-ba29-411b-b799-784262d275bd/user_config.py @@ -2,7 +2,6 @@ # example: # emu_path = "C:/Users/USERNAME/AppData/Roaming/RetroArch/ -rom_path = "" emu_path = "" # Enter your core DLL file here, be sure to include the file extension diff --git a/psp_05487532-ba29-411b-b799-784262d275bd/version.py b/psp_05487532-ba29-411b-b799-784262d275bd/version.py index 11d27f8..cce384d 100644 --- a/psp_05487532-ba29-411b-b799-784262d275bd/version.py +++ b/psp_05487532-ba29-411b-b799-784262d275bd/version.py @@ -1 +1 @@ -__version__ = '0.1' +__version__ = '0.3' diff --git a/saturn_bd6ec091-8ee0-440a-9e26-71bbf21c05af/manifest.json b/saturn_bd6ec091-8ee0-440a-9e26-71bbf21c05af/manifest.json index b662c2a..bbf35ae 100644 --- a/saturn_bd6ec091-8ee0-440a-9e26-71bbf21c05af/manifest.json +++ b/saturn_bd6ec091-8ee0-440a-9e26-71bbf21c05af/manifest.json @@ -2,7 +2,7 @@ "name": "GOG Galaxy Sega Saturn RetroArch plugin", "platform": "saturn", "guid": "bd6ec091-8ee0-440a-9e26-71bbf21c05af", - "version": "0.1", + "version": "0.3", "description": "Galaxy Plugin to add Sega Saturn isos and start them with the RetroArch emulator", "author": "jshackles", "email": "jshackles@gmail.com", diff --git a/saturn_bd6ec091-8ee0-440a-9e26-71bbf21c05af/plugin.py b/saturn_bd6ec091-8ee0-440a-9e26-71bbf21c05af/plugin.py index c79ebb5..57f310a 100644 --- a/saturn_bd6ec091-8ee0-440a-9e26-71bbf21c05af/plugin.py +++ b/saturn_bd6ec091-8ee0-440a-9e26-71bbf21c05af/plugin.py @@ -49,7 +49,7 @@ def update_game_cache(self): playlist_dict = json.load(playlist_json) for entry in playlist_dict["items"]: rom_path = entry["path"].split("#")[0] - if os.path.abspath(user_config.rom_path) in os.path.abspath(rom_path) and os.path.isfile(rom_path): + if os.path.isfile(rom_path): provided_name = entry["label"].split(" (")[0] game_list.append( Game( @@ -114,7 +114,7 @@ async def get_game_time(self, game_id: str, context:any): playlist_dict = json.load(playlist_json) for rom in playlist_dict["items"]: if game_id == rom["label"].split(" (")[0]: - file_path = user_config.emu_path + "/playlists/logs/" + os.path.abspath(rom["path"]).split(os.path.abspath(user_config.rom_path) + "\\")[1][:-4] + ".lrtl" + file_path = user_config.emu_path + "/playlists/logs/" + rom["path"].rsplit("\\",1)[1].rsplit("#")[0].rsplit(".",1)[0] + ".lrtl" if os.path.isfile(file_path): with open(file_path) as json_data: time_data = json.load(json_data) diff --git a/saturn_bd6ec091-8ee0-440a-9e26-71bbf21c05af/user_config.py b/saturn_bd6ec091-8ee0-440a-9e26-71bbf21c05af/user_config.py index 771e35b..75c87bb 100644 --- a/saturn_bd6ec091-8ee0-440a-9e26-71bbf21c05af/user_config.py +++ b/saturn_bd6ec091-8ee0-440a-9e26-71bbf21c05af/user_config.py @@ -2,7 +2,6 @@ # example: # emu_path = "C:/Users/USERNAME/AppData/Roaming/RetroArch/ -rom_path = "" emu_path = "" # Enter your core DLL file here, be sure to include the file extension diff --git a/saturn_bd6ec091-8ee0-440a-9e26-71bbf21c05af/version.py b/saturn_bd6ec091-8ee0-440a-9e26-71bbf21c05af/version.py index 11d27f8..cce384d 100644 --- a/saturn_bd6ec091-8ee0-440a-9e26-71bbf21c05af/version.py +++ b/saturn_bd6ec091-8ee0-440a-9e26-71bbf21c05af/version.py @@ -1 +1 @@ -__version__ = '0.1' +__version__ = '0.3' diff --git a/segacd_ec7197bf-a4e4-4b86-81b9-38ea7d56f3b2/manifest.json b/segacd_ec7197bf-a4e4-4b86-81b9-38ea7d56f3b2/manifest.json index aa70ef7..2331196 100644 --- a/segacd_ec7197bf-a4e4-4b86-81b9-38ea7d56f3b2/manifest.json +++ b/segacd_ec7197bf-a4e4-4b86-81b9-38ea7d56f3b2/manifest.json @@ -2,7 +2,7 @@ "name": "GOG Galaxy Sega CD RetroArch plugin", "platform": "segacd", "guid": "ec7197bf-a4e4-4b86-81b9-38ea7d56f3b2", - "version": "0.1", + "version": "0.3", "description": "Galaxy Plugin to add Sega CD isos and start them with the RetroArch emulator", "author": "jshackles", "email": "jshackles@gmail.com", diff --git a/segacd_ec7197bf-a4e4-4b86-81b9-38ea7d56f3b2/plugin.py b/segacd_ec7197bf-a4e4-4b86-81b9-38ea7d56f3b2/plugin.py index 73ba879..59c3aba 100644 --- a/segacd_ec7197bf-a4e4-4b86-81b9-38ea7d56f3b2/plugin.py +++ b/segacd_ec7197bf-a4e4-4b86-81b9-38ea7d56f3b2/plugin.py @@ -49,7 +49,7 @@ def update_game_cache(self): playlist_dict = json.load(playlist_json) for entry in playlist_dict["items"]: rom_path = entry["path"].split("#")[0] - if os.path.abspath(user_config.rom_path) in os.path.abspath(rom_path) and os.path.isfile(rom_path): + if os.path.isfile(rom_path): provided_name = entry["label"].split(" (")[0] game_list.append( Game( @@ -114,7 +114,7 @@ async def get_game_time(self, game_id: str, context:any): playlist_dict = json.load(playlist_json) for rom in playlist_dict["items"]: if game_id == rom["label"].split(" (")[0]: - file_path = user_config.emu_path + "/playlists/logs/" + os.path.abspath(rom["path"]).split(os.path.abspath(user_config.rom_path) + "\\")[1][:-4] + ".lrtl" + file_path = user_config.emu_path + "/playlists/logs/" + rom["path"].rsplit("\\",1)[1].rsplit("#")[0].rsplit(".",1)[0] + ".lrtl" if os.path.isfile(file_path): with open(file_path) as json_data: time_data = json.load(json_data) diff --git a/segacd_ec7197bf-a4e4-4b86-81b9-38ea7d56f3b2/user_config.py b/segacd_ec7197bf-a4e4-4b86-81b9-38ea7d56f3b2/user_config.py index 5de008e..8abbed4 100644 --- a/segacd_ec7197bf-a4e4-4b86-81b9-38ea7d56f3b2/user_config.py +++ b/segacd_ec7197bf-a4e4-4b86-81b9-38ea7d56f3b2/user_config.py @@ -2,7 +2,6 @@ # example: # emu_path = "C:/Users/USERNAME/AppData/Roaming/RetroArch/ -rom_path = "" emu_path = "" # Enter your core DLL file here, be sure to include the file extension diff --git a/segacd_ec7197bf-a4e4-4b86-81b9-38ea7d56f3b2/version.py b/segacd_ec7197bf-a4e4-4b86-81b9-38ea7d56f3b2/version.py index 11d27f8..cce384d 100644 --- a/segacd_ec7197bf-a4e4-4b86-81b9-38ea7d56f3b2/version.py +++ b/segacd_ec7197bf-a4e4-4b86-81b9-38ea7d56f3b2/version.py @@ -1 +1 @@ -__version__ = '0.1' +__version__ = '0.3' diff --git a/segag_e3ac94e7-945e-459d-bc1e-676cff8173f9/manifest.json b/segag_e3ac94e7-945e-459d-bc1e-676cff8173f9/manifest.json index a61d5e9..312c9b0 100644 --- a/segag_e3ac94e7-945e-459d-bc1e-676cff8173f9/manifest.json +++ b/segag_e3ac94e7-945e-459d-bc1e-676cff8173f9/manifest.json @@ -2,7 +2,7 @@ "name": "GOG Galaxy Sega Genesis RetroArch plugin", "platform": "segag", "guid": "e3ac94e7-945e-459d-bc1e-676cff8173f9", - "version": "0.1", + "version": "0.3", "description": "Galaxy Plugin to add Sega Genesis roms and start them with the RetroArch emulator", "author": "jshackles", "email": "jshackles@gmail.com", diff --git a/segag_e3ac94e7-945e-459d-bc1e-676cff8173f9/plugin.py b/segag_e3ac94e7-945e-459d-bc1e-676cff8173f9/plugin.py index 6a59fa4..7fe6f19 100644 --- a/segag_e3ac94e7-945e-459d-bc1e-676cff8173f9/plugin.py +++ b/segag_e3ac94e7-945e-459d-bc1e-676cff8173f9/plugin.py @@ -49,7 +49,7 @@ def update_game_cache(self): playlist_dict = json.load(playlist_json) for entry in playlist_dict["items"]: rom_path = entry["path"].split("#")[0] - if os.path.abspath(user_config.rom_path) in os.path.abspath(rom_path) and os.path.isfile(rom_path): + if os.path.isfile(rom_path): provided_name = entry["label"].split(" (")[0] game_list.append( Game( @@ -114,7 +114,7 @@ async def get_game_time(self, game_id: str, context:any): playlist_dict = json.load(playlist_json) for rom in playlist_dict["items"]: if game_id == rom["label"].split(" (")[0]: - file_path = user_config.emu_path + "/playlists/logs/" + os.path.abspath(rom["path"]).split(os.path.abspath(user_config.rom_path) + "\\")[1][:-4] + ".lrtl" + file_path = user_config.emu_path + "/playlists/logs/" + rom["path"].rsplit("\\",1)[1].rsplit("#")[0].rsplit(".",1)[0] + ".lrtl" if os.path.isfile(file_path): with open(file_path) as json_data: time_data = json.load(json_data) diff --git a/segag_e3ac94e7-945e-459d-bc1e-676cff8173f9/user_config.py b/segag_e3ac94e7-945e-459d-bc1e-676cff8173f9/user_config.py index 5de008e..8abbed4 100644 --- a/segag_e3ac94e7-945e-459d-bc1e-676cff8173f9/user_config.py +++ b/segag_e3ac94e7-945e-459d-bc1e-676cff8173f9/user_config.py @@ -2,7 +2,6 @@ # example: # emu_path = "C:/Users/USERNAME/AppData/Roaming/RetroArch/ -rom_path = "" emu_path = "" # Enter your core DLL file here, be sure to include the file extension diff --git a/segag_e3ac94e7-945e-459d-bc1e-676cff8173f9/version.py b/segag_e3ac94e7-945e-459d-bc1e-676cff8173f9/version.py index 11d27f8..cce384d 100644 --- a/segag_e3ac94e7-945e-459d-bc1e-676cff8173f9/version.py +++ b/segag_e3ac94e7-945e-459d-bc1e-676cff8173f9/version.py @@ -1 +1 @@ -__version__ = '0.1' +__version__ = '0.3' diff --git a/sms_c6689bfb-7ba4-4d24-98e3-bd2dc339926b/manifest.json b/sms_c6689bfb-7ba4-4d24-98e3-bd2dc339926b/manifest.json index a47b7cc..20a53e2 100644 --- a/sms_c6689bfb-7ba4-4d24-98e3-bd2dc339926b/manifest.json +++ b/sms_c6689bfb-7ba4-4d24-98e3-bd2dc339926b/manifest.json @@ -2,7 +2,7 @@ "name": "GOG Galaxy Sega Master System RetroArch plugin", "platform": "sms", "guid": "c6689bfb-7ba4-4d24-98e3-bd2dc339926b", - "version": "0.1", + "version": "0.3", "description": "Galaxy Plugin to add Sega Master System roms and start them with the RetroArch emulator", "author": "jshackles", "email": "jshackles@gmail.com", diff --git a/sms_c6689bfb-7ba4-4d24-98e3-bd2dc339926b/plugin.py b/sms_c6689bfb-7ba4-4d24-98e3-bd2dc339926b/plugin.py index ce6a112..c13d939 100644 --- a/sms_c6689bfb-7ba4-4d24-98e3-bd2dc339926b/plugin.py +++ b/sms_c6689bfb-7ba4-4d24-98e3-bd2dc339926b/plugin.py @@ -49,7 +49,7 @@ def update_game_cache(self): playlist_dict = json.load(playlist_json) for entry in playlist_dict["items"]: rom_path = entry["path"].split("#")[0] - if os.path.abspath(user_config.rom_path) in os.path.abspath(rom_path) and os.path.isfile(rom_path): + if os.path.isfile(rom_path): provided_name = entry["label"].split(" (")[0] game_list.append( Game( @@ -114,7 +114,7 @@ async def get_game_time(self, game_id: str, context:any): playlist_dict = json.load(playlist_json) for rom in playlist_dict["items"]: if game_id == rom["label"].split(" (")[0]: - file_path = user_config.emu_path + "/playlists/logs/" + os.path.abspath(rom["path"]).split(os.path.abspath(user_config.rom_path) + "\\")[1][:-4] + ".lrtl" + file_path = user_config.emu_path + "/playlists/logs/" + rom["path"].rsplit("\\",1)[1].rsplit("#")[0].rsplit(".",1)[0] + ".lrtl" if os.path.isfile(file_path): with open(file_path) as json_data: time_data = json.load(json_data) diff --git a/sms_c6689bfb-7ba4-4d24-98e3-bd2dc339926b/user_config.py b/sms_c6689bfb-7ba4-4d24-98e3-bd2dc339926b/user_config.py index 5de008e..8abbed4 100644 --- a/sms_c6689bfb-7ba4-4d24-98e3-bd2dc339926b/user_config.py +++ b/sms_c6689bfb-7ba4-4d24-98e3-bd2dc339926b/user_config.py @@ -2,7 +2,6 @@ # example: # emu_path = "C:/Users/USERNAME/AppData/Roaming/RetroArch/ -rom_path = "" emu_path = "" # Enter your core DLL file here, be sure to include the file extension diff --git a/sms_c6689bfb-7ba4-4d24-98e3-bd2dc339926b/version.py b/sms_c6689bfb-7ba4-4d24-98e3-bd2dc339926b/version.py index 11d27f8..cce384d 100644 --- a/sms_c6689bfb-7ba4-4d24-98e3-bd2dc339926b/version.py +++ b/sms_c6689bfb-7ba4-4d24-98e3-bd2dc339926b/version.py @@ -1 +1 @@ -__version__ = '0.1' +__version__ = '0.3' diff --git a/snes_bc831044-f772-4391-8c22-529f42cb9799/manifest.json b/snes_bc831044-f772-4391-8c22-529f42cb9799/manifest.json index 42c5476..b0ea0c8 100644 --- a/snes_bc831044-f772-4391-8c22-529f42cb9799/manifest.json +++ b/snes_bc831044-f772-4391-8c22-529f42cb9799/manifest.json @@ -2,7 +2,7 @@ "name": "GOG Galaxy SNES RetroArch plugin", "platform": "snes", "guid": "bc831044-f772-4391-8c22-529f42cb9799", - "version": "0.1", + "version": "0.3", "description": "Galaxy Plugin to add SNES roms and start them with the RetroArch emulator", "author": "jshackles", "email": "jshackles@gmail.com", diff --git a/snes_bc831044-f772-4391-8c22-529f42cb9799/plugin.py b/snes_bc831044-f772-4391-8c22-529f42cb9799/plugin.py index 4681c1d..27d4b49 100644 --- a/snes_bc831044-f772-4391-8c22-529f42cb9799/plugin.py +++ b/snes_bc831044-f772-4391-8c22-529f42cb9799/plugin.py @@ -49,7 +49,7 @@ def update_game_cache(self): playlist_dict = json.load(playlist_json) for entry in playlist_dict["items"]: rom_path = entry["path"].split("#")[0] - if os.path.abspath(user_config.rom_path) in os.path.abspath(rom_path) and os.path.isfile(rom_path): + if os.path.isfile(rom_path): provided_name = entry["label"].split(" (")[0] game_list.append( Game( @@ -114,7 +114,7 @@ async def get_game_time(self, game_id: str, context:any): playlist_dict = json.load(playlist_json) for rom in playlist_dict["items"]: if game_id == rom["label"].split(" (")[0]: - file_path = user_config.emu_path + "/playlists/logs/" + os.path.abspath(rom["path"]).split(os.path.abspath(user_config.rom_path) + "\\")[1][:-4] + ".lrtl" + file_path = user_config.emu_path + "/playlists/logs/" + rom["path"].rsplit("\\",1)[1].rsplit("#")[0].rsplit(".",1)[0] + ".lrtl" if os.path.isfile(file_path): with open(file_path) as json_data: time_data = json.load(json_data) diff --git a/snes_bc831044-f772-4391-8c22-529f42cb9799/user_config.py b/snes_bc831044-f772-4391-8c22-529f42cb9799/user_config.py index cef5571..4d4d3a4 100644 --- a/snes_bc831044-f772-4391-8c22-529f42cb9799/user_config.py +++ b/snes_bc831044-f772-4391-8c22-529f42cb9799/user_config.py @@ -2,7 +2,6 @@ # example: # emu_path = "C:/Users/USERNAME/AppData/Roaming/RetroArch/ -rom_path = "" emu_path = "" # Enter your core DLL file here, be sure to include the file extension diff --git a/snes_bc831044-f772-4391-8c22-529f42cb9799/version.py b/snes_bc831044-f772-4391-8c22-529f42cb9799/version.py index 11d27f8..cce384d 100644 --- a/snes_bc831044-f772-4391-8c22-529f42cb9799/version.py +++ b/snes_bc831044-f772-4391-8c22-529f42cb9799/version.py @@ -1 +1 @@ -__version__ = '0.1' +__version__ = '0.3'