diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 179b290..34d42d2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -140,10 +140,10 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: v2.5.5 - name: v2.5.5 + tag_name: v2.5.6 + name: v2.5.6 body: | - Create Linux release. + Point to games.yml on MacOS. draft: false prerelease: false files: | diff --git a/PySN.py b/PySN.py index 5629bfb..4efb67f 100644 --- a/PySN.py +++ b/PySN.py @@ -9,6 +9,7 @@ import yaml import time import sys +from pathlib import Path from fnmatch import fnmatch from configparser import ConfigParser import xml.etree.ElementTree as ET @@ -100,7 +101,7 @@ def __init__(self, *args, **kwargs): self.edit_button1 = customtkinter.CTkButton(master=self, width = 50, text='Edit', command = self.button_save_loc) self.edit_button1.grid(row=1, padx=5, pady=(0,0), column=4, sticky='new') - self.rpcs3_dir_label = customtkinter.CTkLabel(master=self, text='Folder Containing RPCS3 (Not Needed On Linux):', anchor='center') + self.rpcs3_dir_label = customtkinter.CTkLabel(master=self, text='Folder Containing RPCS3 (Windows Only):', anchor='center') self.rpcs3_dir_label.grid(row=2, column=1, columnspan=4, padx=0, pady=(0,0), sticky='sew') self.yaml_dir_field = customtkinter.CTkTextbox(master=self, height=25, width = 400, wrap='none') @@ -483,9 +484,10 @@ def search_type(self): else: console = 'PlayStation 3' if sys.platform.startswith('linux'): - home_dir = os.environ['HOME'] - yml_dir = home_dir+'/.config/rpcs3/games.yml' - else: yml_dir = rpcs3_dir+'config/games.yml' + yml_dir = Path.home() / '.config' / 'rpcs3' / 'games.yml' + if sys.platform.startswith('darwin'): + yml_dir = Path.home() / 'Library' / 'Application Support' / 'rpcs3' / 'games.yml' + else: yml_dir = Path(rpcs3_dir) / 'config' / 'games.yml' if os.path.isfile(yml_dir): with open(yml_dir, 'r') as f: file = yaml.safe_load(f) diff --git a/README.md b/README.md index 1d7be95..25cf93d 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,9 @@ Once the program is open, just type a valid PS3, PS4, or PS Vita Title ID (e.g. This program will then locate any Title Updates for that game, list them out, and ask you if you would like to download them. -You can also point PySN to your RPCS3 installation via the settings. If you do so, you can then check the "Search Games.yml" box and hit "Search" to find updates for all of the games you have in RPCS3 at once. +You can also have PySN scan your RPCS3 games.yml to find updates for all of your installed games at once. On Linux and MacOS, all you need to do is check the "Search Games.yml" checkbox and hit the search button. + +On Windows you will need to point PySN to your RPCS3 installation via the settings first. If you want to download firmware, just type in "fw" or "firmware" and hit enter or click the search button.