Splatlogger 1.2.1__tar.gz → 1.2.3__tar.gz

{splatlogger-1.2.1/src/Splatlogger.egg-info → splatlogger-1.2.3}/PKG-INFO

@@ -1,22 +1,26 @@
 Metadata-Version: 2.4
 Name: Splatlogger
-Version: 1.2.1
+Version: 1.2.3
 Summary: PID Grabber and player/match information logging tool for Splatoon
 Author-email: Shadow Doggo <shadowdoggo@protonmail.com>
 License-Expression: MIT
 Project-URL: Source Code, https://codeberg.org/ShadowDoggo/Splatlogger
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.11
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: userpaths
-Requires-Dist: requests
-Requires-Dist: psutil
-Requires-Dist: pymemoryeditor>=2.0.0
-Requires-Dist: colorama
-Requires-Dist: clean-text
-Requires-Dist: prompt_toolkit
+Requires-Dist: tomli>=1.1.0; python_version < "3.11"
+Requires-Dist: userpaths>=0.1.3
+Requires-Dist: requests>=2.28.0
+Requires-Dist: colorama>=0.4.6
+Requires-Dist: clean-text>=0.7.1
+Requires-Dist: prompt_toolkit>=3.0.0
+Provides-Extra: cemu
+Requires-Dist: psutil>=5.9.0; extra == "cemu"
+Requires-Dist: pymemoryeditor>=2.0.0; extra == "cemu"
+Provides-Extra: build
+Requires-Dist: pyinstaller>=6.6.0; extra == "build"
 Dynamic: license-file
 
 # Splatlogger
@@ -47,63 +51,71 @@ On Aroma, use [TCPGecko-Plugin](https://github.com/PinkDiamondTeam/TCPGecko-Plug
 
 ## Usage
 ### Running the executable
-Windows and Linux executables are provided on the Releases page.
+Windows and Linux executables are provided on the [Releases](https://codeberg.org/ShadowDoggo/Splatlogger/releases/latest) page.
 
 Run Splatlogger with:
 ```
-path/to/Splatlogger-executable --ip IP [options]
+path/to/Splatlogger-executable --ip IP [options] / --cemu [PID] [options]
 ```
-where `IP` is your Wii U's LAN IP address.
+Use the `--ip` target where `IP` is your Wii U's LAN IP address,
+or the `-c` / `--cemu` target to enable Cemu mode where `PID` is the process ID of the Cemu process (optional, should be detected automatically).
 
 Open a command prompt/terminal window and drag the executable into it to automatically get the path.
 
+On Linux, you might need to make the file executable first with `chmod +x path/to/Splatlogger-executable`
+
 ### Running with Python
 You can install Splatlogger as a package from PyPI:
 ```
 pip install Splatlogger
 ```
 
-The run with:
+To enable Cemu support, install with the `cemu` extra:
+```
+pip install "Splatlogger[cemu]"
+```
+
+Then run with:
 ```
-splatlogger --ip IP [options]
+splatlogger --ip IP [options] / --cemu [PID] [options]
 ```
-(if that fails, try `python -m splatlogger`) where `IP` is your Wii U's LAN IP address.
+(if that fails, try `python -m splatlogger`)
+
+Use the `--ip` target where `IP` is your Wii U's LAN IP address,
+or the `-c` / `--cemu` target to enable Cemu mode where `PID` is the process ID of the Cemu process (optional, should be detected automatically).
 
-To run from source instead, download the latest source archive from the Releases
+To run from source instead, download the latest source archive from the [Releases](https://codeberg.org/ShadowDoggo/Splatlogger/releases/latest)
 page and extract it, then open a terminal window in the extracted directory.
 
 Install the required dependencies:
 ```
-pip install -r requirements.txt
+pip install -r requirements.txt / cemu_requirements.txt
 ```
 
 Then move into the `src` directory and run:
 ```
-python -m splatlogger --ip IP [options]
+python -m splatlogger --ip IP [options] / --cemu [PID] [options]
 ```
 
 ### Options
-- `-c [PID]`, `--cemu [PID]` - Switch to Cemu mode. The `--ip` argument is not required.
-  - `PID` - Process ID of the Cemu process (optional).
-
 - `--log-level option` - Set how much data should be logged.
   - `none` - Don't create a log file.
   - `standard` - Log only basic player information, the same as what's printed to the console (default).
   - `extended` - Log all player information and additional match information.
-  - `stats` - Same as above with the addition of player stats (points, K/D, win/lose) and disconnect detection. 
+  - `stats` - Same as above with the addition of player stats (points, K/D, win/lose) and disconnect detection.
 Requires the match to end to finish logging; if it ends abruptly, the stats won't be logged.
 
 - `--service` - Choose which network service you're using.
   - `none` - Disable fetching account info.
   - `pretendo` - Pretendo Network (default).
-  - `spfn` - Splatfestival Network.
+  - `altendo` - Altendo Network.
 
-- `-a [option]`, `--auto [option]` - Enable auto logging. When enabled will automatically log every match you play. 
+- `-a [option]`, `--auto [option]` - Enable auto logging. When enabled will automatically log every match you play.
 Also allows you to view information about the lobby/gathering while on the matching screen.
   - `all` - Save a log of all matches you play (default).
   - `latest` - Save a log of only the latest match.
 
-    (These options don't affect anything if log level is set to `none`)
+    (These options don't affect anything if the log level is set to `none`)
 
 - `--stack Address (in hex)` - (Cemu only, optional) Beginning address of the stack space for Default Core 1 (Debug > View PPC threads).
 Only required for logging stats. If the default values don't work, you'll need to specify this manually.
@@ -134,7 +146,7 @@ Example `config.toml`:
 # Target Wii U LAN IP address (omit if using Cemu)
 ip = "192.168.1.50"
 
-# Target network service: "pretendo", "spfn", or "none"
+# Target network service: "pretendo", "altendo", or "none"
 service = "pretendo"
 
 # Log level: "standard", "extended", "stats", or "none"
@@ -178,7 +190,7 @@ In that case, it's best to run the package from source or use the executable ins
 ## Important notes
 - The data collected by Splatlogger is public player info shared by the game with every user you play with in online matches.
 
-- Network IDs and Mii names are fetched from the Pretendo or SPFN account server; this can be disabled with `--service none`.
+- Network IDs and Mii names are fetched from the network's account server; this can be disabled with `--service none`.
 
 - Splatlogger does not collect any sensitive information such as account email addresses or IP addresses.
 
@@ -187,28 +199,13 @@ In that case, it's best to run the package from source or use the executable ins
 - Please handle the logs responsibly. I do not encourage sharing other users' data without their permission, even if no real harm can be done with it.
 
 ## Building the executable with PyInstaller
-Set up a virtual environment and install PyInstaller as well as the required dependencies.
+Set up a virtual environment and run `pip install -r build_requirements.txt` to install PyInstaller as well as the required dependencies.
 
-In `match_logger.py`, replace `from importlib import resources` with `import sys` and
-```py
-names_path = resources.files(__package__).joinpath("resources", "names.json")
+Run:
 ```
-
-with
-```py
-names_path = Path(sys._MEIPASS) / "resources/names.json"
-```
-
-Then run:
+python scripts/build.py [--upx-dir path/to/upx]
 ```
-pyinstaller --noconfirm --onefile --console --name "Splatlogger-v1.x" --upx-dir "path/to/upx" --optimize "2" --add-data "path/to/Splatlogger/src/splatlogger/resources:resources/" --icon "NONE" "path/to/Splatlogger/src/run.py"
-```
-replacing the placeholder paths with the actual ones.
-
-You can omit `--upx-dir` if you're not using UPX to compress the executable and `--optimize "2"` to disable
-bytecode optimization.
-
-On Linux, add `--bootloader-ignore-signals` and remove `--upx-dir` and `--icon` as they are not supported.
+use `--upx-dir` if you're using UPX to compress the executable.
 
 ## Acknowledgments
 - NWPlayer123 for the reference implementation of a TCPGecko library.

{splatlogger-1.2.1 → splatlogger-1.2.3}/README.md

@@ -26,63 +26,71 @@ On Aroma, use [TCPGecko-Plugin](https://github.com/PinkDiamondTeam/TCPGecko-Plug
 
 ## Usage
 ### Running the executable
-Windows and Linux executables are provided on the Releases page.
+Windows and Linux executables are provided on the [Releases](https://codeberg.org/ShadowDoggo/Splatlogger/releases/latest) page.
 
 Run Splatlogger with:
 ```
-path/to/Splatlogger-executable --ip IP [options]
+path/to/Splatlogger-executable --ip IP [options] / --cemu [PID] [options]
 ```
-where `IP` is your Wii U's LAN IP address.
+Use the `--ip` target where `IP` is your Wii U's LAN IP address,
+or the `-c` / `--cemu` target to enable Cemu mode where `PID` is the process ID of the Cemu process (optional, should be detected automatically).
 
 Open a command prompt/terminal window and drag the executable into it to automatically get the path.
 
+On Linux, you might need to make the file executable first with `chmod +x path/to/Splatlogger-executable`
+
 ### Running with Python
 You can install Splatlogger as a package from PyPI:
 ```
 pip install Splatlogger
 ```
 
-The run with:
+To enable Cemu support, install with the `cemu` extra:
+```
+pip install "Splatlogger[cemu]"
+```
+
+Then run with:
 ```
-splatlogger --ip IP [options]
+splatlogger --ip IP [options] / --cemu [PID] [options]
 ```
-(if that fails, try `python -m splatlogger`) where `IP` is your Wii U's LAN IP address.
+(if that fails, try `python -m splatlogger`)
+
+Use the `--ip` target where `IP` is your Wii U's LAN IP address,
+or the `-c` / `--cemu` target to enable Cemu mode where `PID` is the process ID of the Cemu process (optional, should be detected automatically).
 
-To run from source instead, download the latest source archive from the Releases
+To run from source instead, download the latest source archive from the [Releases](https://codeberg.org/ShadowDoggo/Splatlogger/releases/latest)
 page and extract it, then open a terminal window in the extracted directory.
 
 Install the required dependencies:
 ```
-pip install -r requirements.txt
+pip install -r requirements.txt / cemu_requirements.txt
 ```
 
 Then move into the `src` directory and run:
 ```
-python -m splatlogger --ip IP [options]
+python -m splatlogger --ip IP [options] / --cemu [PID] [options]
 ```
 
 ### Options
-- `-c [PID]`, `--cemu [PID]` - Switch to Cemu mode. The `--ip` argument is not required.
-  - `PID` - Process ID of the Cemu process (optional).
-
 - `--log-level option` - Set how much data should be logged.
   - `none` - Don't create a log file.
   - `standard` - Log only basic player information, the same as what's printed to the console (default).
   - `extended` - Log all player information and additional match information.
-  - `stats` - Same as above with the addition of player stats (points, K/D, win/lose) and disconnect detection. 
+  - `stats` - Same as above with the addition of player stats (points, K/D, win/lose) and disconnect detection.
 Requires the match to end to finish logging; if it ends abruptly, the stats won't be logged.
 
 - `--service` - Choose which network service you're using.
   - `none` - Disable fetching account info.
   - `pretendo` - Pretendo Network (default).
-  - `spfn` - Splatfestival Network.
+  - `altendo` - Altendo Network.
 
-- `-a [option]`, `--auto [option]` - Enable auto logging. When enabled will automatically log every match you play. 
+- `-a [option]`, `--auto [option]` - Enable auto logging. When enabled will automatically log every match you play.
 Also allows you to view information about the lobby/gathering while on the matching screen.
   - `all` - Save a log of all matches you play (default).
   - `latest` - Save a log of only the latest match.
 
-    (These options don't affect anything if log level is set to `none`)
+    (These options don't affect anything if the log level is set to `none`)
 
 - `--stack Address (in hex)` - (Cemu only, optional) Beginning address of the stack space for Default Core 1 (Debug > View PPC threads).
 Only required for logging stats. If the default values don't work, you'll need to specify this manually.
@@ -113,7 +121,7 @@ Example `config.toml`:
 # Target Wii U LAN IP address (omit if using Cemu)
 ip = "192.168.1.50"
 
-# Target network service: "pretendo", "spfn", or "none"
+# Target network service: "pretendo", "altendo", or "none"
 service = "pretendo"
 
 # Log level: "standard", "extended", "stats", or "none"
@@ -157,7 +165,7 @@ In that case, it's best to run the package from source or use the executable ins
 ## Important notes
 - The data collected by Splatlogger is public player info shared by the game with every user you play with in online matches.
 
-- Network IDs and Mii names are fetched from the Pretendo or SPFN account server; this can be disabled with `--service none`.
+- Network IDs and Mii names are fetched from the network's account server; this can be disabled with `--service none`.
 
 - Splatlogger does not collect any sensitive information such as account email addresses or IP addresses.
 
@@ -166,28 +174,13 @@ In that case, it's best to run the package from source or use the executable ins
 - Please handle the logs responsibly. I do not encourage sharing other users' data without their permission, even if no real harm can be done with it.
 
 ## Building the executable with PyInstaller
-Set up a virtual environment and install PyInstaller as well as the required dependencies.
+Set up a virtual environment and run `pip install -r build_requirements.txt` to install PyInstaller as well as the required dependencies.
 
-In `match_logger.py`, replace `from importlib import resources` with `import sys` and
-```py
-names_path = resources.files(__package__).joinpath("resources", "names.json")
+Run:
 ```
-
-with
-```py
-names_path = Path(sys._MEIPASS) / "resources/names.json"
-```
-
-Then run:
+python scripts/build.py [--upx-dir path/to/upx]
 ```
-pyinstaller --noconfirm --onefile --console --name "Splatlogger-v1.x" --upx-dir "path/to/upx" --optimize "2" --add-data "path/to/Splatlogger/src/splatlogger/resources:resources/" --icon "NONE" "path/to/Splatlogger/src/run.py"
-```
-replacing the placeholder paths with the actual ones.
-
-You can omit `--upx-dir` if you're not using UPX to compress the executable and `--optimize "2"` to disable
-bytecode optimization.
-
-On Linux, add `--bootloader-ignore-signals` and remove `--upx-dir` and `--icon` as they are not supported.
+use `--upx-dir` if you're using UPX to compress the executable.
 
 ## Acknowledgments
 - NWPlayer123 for the reference implementation of a TCPGecko library.

{splatlogger-1.2.1 → splatlogger-1.2.3}/pyproject.toml

@@ -1,24 +1,23 @@
 [build-system]
-requires = ["setuptools>=83.0.0"]
+requires = ["setuptools>=77.0.3"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "Splatlogger"
-version = "1.2.1"
+version = "1.2.3"
 authors = [
     { name="Shadow Doggo", email="shadowdoggo@protonmail.com" }
 ]
 description = "PID Grabber and player/match information logging tool for Splatoon"
 readme = "README.md"
-requires-python = ">=3.11"
+requires-python = ">=3.10"
 dependencies = [
-    "userpaths",
-    "requests",
-    "psutil",
-    "pymemoryeditor>=2.0.0",
-    "colorama",
-    "clean-text",
-    "prompt_toolkit"
+    "tomli>=1.1.0; python_version<'3.11'",
+    "userpaths>=0.1.3",
+    "requests>=2.28.0",
+    "colorama>=0.4.6",
+    "clean-text>=0.7.1",
+    "prompt_toolkit>=3.0.0"
 ]
 classifiers = [
     "Programming Language :: Python :: 3",
@@ -27,6 +26,15 @@ classifiers = [
 license = "MIT"
 license-files = ["LICENSE"]
 
+[project.optional-dependencies]
+cemu = [
+    "psutil>=5.9.0",
+    "pymemoryeditor>=2.0.0"
+]
+build = [
+    "pyinstaller>=6.6.0"
+]
+
 [project.urls]
 "Source Code" = "https://codeberg.org/ShadowDoggo/Splatlogger"
 

{splatlogger-1.2.1 → splatlogger-1.2.3/src/Splatlogger.egg-info}/PKG-INFO

@@ -1,22 +1,26 @@
 Metadata-Version: 2.4
 Name: Splatlogger
-Version: 1.2.1
+Version: 1.2.3
 Summary: PID Grabber and player/match information logging tool for Splatoon
 Author-email: Shadow Doggo <shadowdoggo@protonmail.com>
 License-Expression: MIT
 Project-URL: Source Code, https://codeberg.org/ShadowDoggo/Splatlogger
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.11
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: userpaths
-Requires-Dist: requests
-Requires-Dist: psutil
-Requires-Dist: pymemoryeditor>=2.0.0
-Requires-Dist: colorama
-Requires-Dist: clean-text
-Requires-Dist: prompt_toolkit
+Requires-Dist: tomli>=1.1.0; python_version < "3.11"
+Requires-Dist: userpaths>=0.1.3
+Requires-Dist: requests>=2.28.0
+Requires-Dist: colorama>=0.4.6
+Requires-Dist: clean-text>=0.7.1
+Requires-Dist: prompt_toolkit>=3.0.0
+Provides-Extra: cemu
+Requires-Dist: psutil>=5.9.0; extra == "cemu"
+Requires-Dist: pymemoryeditor>=2.0.0; extra == "cemu"
+Provides-Extra: build
+Requires-Dist: pyinstaller>=6.6.0; extra == "build"
 Dynamic: license-file
 
 # Splatlogger
@@ -47,63 +51,71 @@ On Aroma, use [TCPGecko-Plugin](https://github.com/PinkDiamondTeam/TCPGecko-Plug
 
 ## Usage
 ### Running the executable
-Windows and Linux executables are provided on the Releases page.
+Windows and Linux executables are provided on the [Releases](https://codeberg.org/ShadowDoggo/Splatlogger/releases/latest) page.
 
 Run Splatlogger with:
 ```
-path/to/Splatlogger-executable --ip IP [options]
+path/to/Splatlogger-executable --ip IP [options] / --cemu [PID] [options]
 ```
-where `IP` is your Wii U's LAN IP address.
+Use the `--ip` target where `IP` is your Wii U's LAN IP address,
+or the `-c` / `--cemu` target to enable Cemu mode where `PID` is the process ID of the Cemu process (optional, should be detected automatically).
 
 Open a command prompt/terminal window and drag the executable into it to automatically get the path.
 
+On Linux, you might need to make the file executable first with `chmod +x path/to/Splatlogger-executable`
+
 ### Running with Python
 You can install Splatlogger as a package from PyPI:
 ```
 pip install Splatlogger
 ```
 
-The run with:
+To enable Cemu support, install with the `cemu` extra:
+```
+pip install "Splatlogger[cemu]"
+```
+
+Then run with:
 ```
-splatlogger --ip IP [options]
+splatlogger --ip IP [options] / --cemu [PID] [options]
 ```
-(if that fails, try `python -m splatlogger`) where `IP` is your Wii U's LAN IP address.
+(if that fails, try `python -m splatlogger`)
+
+Use the `--ip` target where `IP` is your Wii U's LAN IP address,
+or the `-c` / `--cemu` target to enable Cemu mode where `PID` is the process ID of the Cemu process (optional, should be detected automatically).
 
-To run from source instead, download the latest source archive from the Releases
+To run from source instead, download the latest source archive from the [Releases](https://codeberg.org/ShadowDoggo/Splatlogger/releases/latest)
 page and extract it, then open a terminal window in the extracted directory.
 
 Install the required dependencies:
 ```
-pip install -r requirements.txt
+pip install -r requirements.txt / cemu_requirements.txt
 ```
 
 Then move into the `src` directory and run:
 ```
-python -m splatlogger --ip IP [options]
+python -m splatlogger --ip IP [options] / --cemu [PID] [options]
 ```
 
 ### Options
-- `-c [PID]`, `--cemu [PID]` - Switch to Cemu mode. The `--ip` argument is not required.
-  - `PID` - Process ID of the Cemu process (optional).
-
 - `--log-level option` - Set how much data should be logged.
   - `none` - Don't create a log file.
   - `standard` - Log only basic player information, the same as what's printed to the console (default).
   - `extended` - Log all player information and additional match information.
-  - `stats` - Same as above with the addition of player stats (points, K/D, win/lose) and disconnect detection. 
+  - `stats` - Same as above with the addition of player stats (points, K/D, win/lose) and disconnect detection.
 Requires the match to end to finish logging; if it ends abruptly, the stats won't be logged.
 
 - `--service` - Choose which network service you're using.
   - `none` - Disable fetching account info.
   - `pretendo` - Pretendo Network (default).
-  - `spfn` - Splatfestival Network.
+  - `altendo` - Altendo Network.
 
-- `-a [option]`, `--auto [option]` - Enable auto logging. When enabled will automatically log every match you play. 
+- `-a [option]`, `--auto [option]` - Enable auto logging. When enabled will automatically log every match you play.
 Also allows you to view information about the lobby/gathering while on the matching screen.
   - `all` - Save a log of all matches you play (default).
   - `latest` - Save a log of only the latest match.
 
-    (These options don't affect anything if log level is set to `none`)
+    (These options don't affect anything if the log level is set to `none`)
 
 - `--stack Address (in hex)` - (Cemu only, optional) Beginning address of the stack space for Default Core 1 (Debug > View PPC threads).
 Only required for logging stats. If the default values don't work, you'll need to specify this manually.
@@ -134,7 +146,7 @@ Example `config.toml`:
 # Target Wii U LAN IP address (omit if using Cemu)
 ip = "192.168.1.50"
 
-# Target network service: "pretendo", "spfn", or "none"
+# Target network service: "pretendo", "altendo", or "none"
 service = "pretendo"
 
 # Log level: "standard", "extended", "stats", or "none"
@@ -178,7 +190,7 @@ In that case, it's best to run the package from source or use the executable ins
 ## Important notes
 - The data collected by Splatlogger is public player info shared by the game with every user you play with in online matches.
 
-- Network IDs and Mii names are fetched from the Pretendo or SPFN account server; this can be disabled with `--service none`.
+- Network IDs and Mii names are fetched from the network's account server; this can be disabled with `--service none`.
 
 - Splatlogger does not collect any sensitive information such as account email addresses or IP addresses.
 
@@ -187,28 +199,13 @@ In that case, it's best to run the package from source or use the executable ins
 - Please handle the logs responsibly. I do not encourage sharing other users' data without their permission, even if no real harm can be done with it.
 
 ## Building the executable with PyInstaller
-Set up a virtual environment and install PyInstaller as well as the required dependencies.
+Set up a virtual environment and run `pip install -r build_requirements.txt` to install PyInstaller as well as the required dependencies.
 
-In `match_logger.py`, replace `from importlib import resources` with `import sys` and
-```py
-names_path = resources.files(__package__).joinpath("resources", "names.json")
+Run:
 ```
-
-with
-```py
-names_path = Path(sys._MEIPASS) / "resources/names.json"
-```
-
-Then run:
+python scripts/build.py [--upx-dir path/to/upx]
 ```
-pyinstaller --noconfirm --onefile --console --name "Splatlogger-v1.x" --upx-dir "path/to/upx" --optimize "2" --add-data "path/to/Splatlogger/src/splatlogger/resources:resources/" --icon "NONE" "path/to/Splatlogger/src/run.py"
-```
-replacing the placeholder paths with the actual ones.
-
-You can omit `--upx-dir` if you're not using UPX to compress the executable and `--optimize "2"` to disable
-bytecode optimization.
-
-On Linux, add `--bootloader-ignore-signals` and remove `--upx-dir` and `--icon` as they are not supported.
+use `--upx-dir` if you're using UPX to compress the executable.
 
 ## Acknowledgments
 - NWPlayer123 for the reference implementation of a TCPGecko library.

{splatlogger-1.2.1 → splatlogger-1.2.3}/src/Splatlogger.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ src/splatlogger/__main__.py
 src/splatlogger/cemu_gecko.py
 src/splatlogger/cli.py
 src/splatlogger/enums.py
+src/splatlogger/errors.py
 src/splatlogger/match_logger.py
 src/splatlogger/splatlogger.py
 src/splatlogger/tcpgecko.py

splatlogger-1.2.3/src/Splatlogger.egg-info/requires.txt

@@ -0,0 +1,15 @@
+userpaths>=0.1.3
+requests>=2.28.0
+colorama>=0.4.6
+clean-text>=0.7.1
+prompt_toolkit>=3.0.0
+
+[:python_version < "3.11"]
+tomli>=1.1.0
+
+[build]
+pyinstaller>=6.6.0
+
+[cemu]
+psutil>=5.9.0
+pymemoryeditor>=2.0.0

splatlogger-1.2.3/src/splatlogger/__init__.py

@@ -0,0 +1,2 @@
+__version__ = "1.2.3"
+__author__ = "Shadow Doggo"

splatlogger-1.2.3/src/splatlogger/__main__.py

@@ -0,0 +1,8 @@
+try:
+    from .cli import cli
+except ImportError:
+    from splatlogger.cli import cli
+
+
+if __name__ == "__main__":
+    cli()

{splatlogger-1.2.1 → splatlogger-1.2.3}/src/splatlogger/cemu_gecko.py

@@ -6,8 +6,11 @@ import struct
 from types import TracebackType
 from typing import Type
 
-import psutil
-from PyMemoryEditor import OpenProcess, ProcessIDNotExistsError  # type: ignore[import-untyped]
+try:
+    import psutil
+    from PyMemoryEditor import OpenProcess, ProcessIDNotExistsError  # type: ignore[import-untyped]
+except ImportError as ex:
+    raise ImportError("psutil and PyMemoryEditor must be installed to use Cemu mode.") from ex
 
 
 class CemuGecko:

{splatlogger-1.2.1 → splatlogger-1.2.3}/src/splatlogger/cli.py

@@ -3,7 +3,6 @@
 import argparse
 import platform
 import sys
-import tomllib
 import webbrowser
 from pathlib import Path
 
@@ -12,18 +11,22 @@ from colorama import Fore, Style, just_fix_windows_console
 from prompt_toolkit import PromptSession
 from prompt_toolkit.patch_stdout import patch_stdout
 
-from . import utility_functions as uf
-from .splatlogger import SplatloggerError, command_lobby_info, main
+from . import utility_functions as uf, __version__
+from .errors import SplatloggerError
+from .splatlogger import command_lobby_info, main
 from .tuples import AppContext, Options
 
-VERSION = "1.2.1"
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    import tomli as tomllib
 
 
 def cli() -> None:
     if platform.system() == "Windows":
         just_fix_windows_console()
 
-    print(f"Splatlogger v{VERSION} by Shadow Doggo\n")
+    print(f"Splatlogger v{__version__} by Shadow Doggo\n")
 
     try:
         options = parse_args()
@@ -112,7 +115,7 @@ def add_parser_arguments(parser: argparse.ArgumentParser) -> None:
     parser.add_argument("--log-level", help="Set how much data should be logged (see README).",
                         choices=["none", "standard", "extended", "stats"], default="standard")
     parser.add_argument("--service", help="Choose which network service you're using (Pretendo by default).",
-                        choices=["none", "pretendo", "spfn"], default="pretendo")
+                        choices=["none", "pretendo", "altendo"], default="pretendo")
     parser.add_argument("-a", "--auto",
                         help="Enable auto logging (see README).",
                         choices=["all", "latest"], nargs="?", const="all")
@@ -130,7 +133,7 @@ CONFIG_TEMPLATE = """# Splatlogger Configuration
 # Target Wii U LAN IP address (omit if using Cemu)
 # ip = "192.168.1.50"
 
-# Target network service: "pretendo", "spfn", or "none"
+# Target network service: "pretendo", "altendo", or "none"
 # service = "pretendo"
 
 # Log level: "standard", "extended", "stats", or "none"

splatlogger-1.2.3/src/splatlogger/errors.py

@@ -0,0 +1,2 @@
+class SplatloggerError(Exception):
+    pass

{splatlogger-1.2.1 → splatlogger-1.2.3}/src/splatlogger/match_logger.py

@@ -2,7 +2,7 @@
 
 import json
 import platform
-# import sys
+import sys
 import time
 from datetime import datetime
 from importlib import resources
@@ -16,6 +16,13 @@ from .enums import Addresses, Offsets, Pointers, VSMode, VSRule
 from .tuples import AccountInfo, AppContext, CommonAddresses, PlayerInfo
 
 
+def get_resource_path(relative_path: str | Path) -> Path:
+    if getattr(sys, "frozen", False) and hasattr(sys, "_MEIPASS"):
+        return Path(sys._MEIPASS) / relative_path
+
+    return Path(str(resources.files(__package__).joinpath(str(relative_path))))
+
+
 class MatchLogger:
     """Provides the match logging functionality of Splatlogger."""
 
@@ -24,8 +31,7 @@ class MatchLogger:
         self._ctx = ctx
         self._stats_offset: int | None = None
         self._align = 2 if ctx.options.auto_logging or ctx.options.single_log else 0
-        names_path = resources.files(__package__).joinpath("resources", "names.json")
-        # names_path = Path(sys._MEIPASS) / "resources/names.json"
+        names_path = get_resource_path("resources/names.json")
         try:
             with names_path.open("r", encoding="utf-8") as names_f:
                 self._names: dict[str, Any] = json.load(names_f)
@@ -70,9 +76,9 @@ class MatchLogger:
         match_info = self._get_match_info()
         versus_mode, versus_rule = match_info[2], match_info[3]
         if self._ctx.options.log_level == "standard":
-            match_log = (f"\nMatch {match_count}\n\n{uf.player_table_header(self._ctx.options.service == 'spfn')}\n"
+            match_log = (f"\nMatch {match_count}\n\n{uf.player_table_header(self._ctx.options.service == 'altendo')}\n"
                          if self._ctx.options.auto_logging or self._ctx.options.single_log else
-                         f"\n{uf.player_table_header(self._ctx.options.service == 'spfn')}\n")
+                         f"\n{uf.player_table_header(self._ctx.options.service == 'altendo')}\n")
         else:
             match_log = self._format_match_info(match_count, date, session_id, match_info)
 
@@ -144,7 +150,7 @@ class MatchLogger:
         )
 
     def _format_match_log(self, player_info: PlayerInfo, vs_mode: int) -> str:
-        network_id_type = "SFID" if self._ctx.options.service == "spfn" else "PNID"
+        network_id_type = "ANID" if self._ctx.options.service == "altendo" else "PNID"
         indent = " " * (self._align + 2)
         fest_info = (
             f"{indent}Splatfest: Team: {self._get_name('fest_team', player_info.fest_team)} ({player_info.fest_team}) | "

{splatlogger-1.2.1 → splatlogger-1.2.3}/src/splatlogger/splatlogger.py

@@ -1,5 +1,7 @@
 # Splatlogger (c) 2025 Shadow Doggo.
 
+from __future__ import annotations
+
 import binascii
 import ipaddress
 import logging
@@ -8,18 +10,20 @@ import time
 from base64 import b64decode
 from contextlib import contextmanager
 from datetime import datetime
-from typing import Callable, Iterator
+from typing import Callable, Iterator, TYPE_CHECKING
 
 import requests
 import userpaths  # type: ignore[import-untyped]
 
 from . import utility_functions as uf
-from .cemu_gecko import CemuGecko, CemuGeckoError
 from .enums import Offsets, Pointers
 from .match_logger import MatchLogger
 from .tcpgecko import GeckoConnectionFailedError, TCPGecko
 from .tuples import AccountInfo, AppContext, CommonAddresses, Options, PlayerInfo
-from .utility_functions import SplatloggerError
+from .errors import SplatloggerError
+
+if TYPE_CHECKING:
+    from .cemu_gecko import CemuGecko
 
 # Hack to remove the unidecode warning from clean-text
 logging.disable(logging.CRITICAL)
@@ -94,7 +98,7 @@ def command_lobby_info(ctx: AppContext) -> bool:
             if players:
                 print("\nPlayers (from first to last joined, you will always be first):")
                 print(
-                    f"\n{'PID':<10} | {'SFID' if ctx.options.service == 'spfn' else 'PNID':<16}\n{'-' * 30}"
+                    f"\n{'PID':<10} | {'ANID' if ctx.options.service == 'altendo' else 'PNID':<16}\n{'-' * 30}"
                 )
                 for player in players:
                     print(f"{player[0]} | {player[1]}")
@@ -123,6 +127,11 @@ def create_match_logger_instance(ctx: AppContext) -> MatchLogger | None:
 
 def create_tcpgecko_instance(options: Options) -> TCPGecko | CemuGecko:
     if options.platform == "cemu":
+        try:
+            from .cemu_gecko import CemuGecko, CemuGeckoError
+        except ImportError as e:
+            raise SplatloggerError(str(e)) from e
+
         try:
             print("Opening Cemu process...")
             return CemuGecko(options.cemu_pid)
@@ -194,7 +203,7 @@ def splatlog(ctx: AppContext, match_logger: MatchLogger | None, match_count: int
     session_id = get_session_id(ctx)
     player_count = get_player_count(ctx, adrs.main_mgr_base_adr)
 
-    print_if_not_silent(ctx, uf.player_table_header(ctx.options.service == "spfn"))
+    print_if_not_silent(ctx, uf.player_table_header(ctx.options.service == "altendo"))
 
     player_info_list: list[PlayerInfo] = []
     request_errors: list[str] = []
@@ -291,7 +300,7 @@ def get_player_account_info(ctx: AppContext, player_pid: int, player_name: str)
     if ctx.options.service == "none":
         return AccountInfo("", player_name, "")
 
-    act_info = get_spfn_account_info(player_pid) if ctx.options.service == "spfn" else get_pn_account_info(player_pid)
+    act_info = get_altendo_account_info(player_pid) if ctx.options.service == "altendo" else get_pn_account_info(player_pid)
     if act_info.request_error:
         return AccountInfo("", player_name, act_info.request_error)
 
@@ -382,7 +391,7 @@ def get_pn_account_info(player_pid: int) -> AccountInfo:
             time.sleep(1)
             continue
 
-        response = uf.process_response(raw_response, spfn=False)
+        response = uf.process_response(raw_response, altendo=False)
         if response is None:
             request_error = "Got empty or invalid response."
             time.sleep(1)
@@ -397,7 +406,7 @@ def get_pn_account_info(player_pid: int) -> AccountInfo:
     return AccountInfo(user_id, mii_name, request_error)
 
 
-def get_spfn_account_info(player_pid: int) -> AccountInfo:
+def get_altendo_account_info(player_pid: int) -> AccountInfo:
     user_id = ""
     mii_name = ""
     request_error = ""
@@ -405,12 +414,12 @@ def get_spfn_account_info(player_pid: int) -> AccountInfo:
     for _ in range(3):
         try:
             raw_response = requests.get(
-                f"https://account.spfn.net/v1/api/admin/mapped_ids?input_type=pid&output_type=user_id&input={player_pid}",
+                f"https://account.altendo.cc/v1/api/admin/mapped_ids?input_type=pid&output_type=user_id&input={player_pid}",
                 headers={"User-Agent": "Mozilla/5.0"},
                 timeout=5
             )
             mii_data_response = requests.get(
-                f"https://account.spfn.net/api/v2/users/{player_pid}/mii",
+                f"https://account.altendo.cc/api/v2/users/{player_pid}/mii",
                 headers={"User-Agent": "Mozilla/5.0"},
                 timeout=5
             )
@@ -425,7 +434,7 @@ def get_spfn_account_info(player_pid: int) -> AccountInfo:
             time.sleep(1)
             continue
 
-        response = uf.process_response(raw_response, spfn=True)
+        response = uf.process_response(raw_response, altendo=True)
         if response is None:
             request_error = "Got empty or invalid response."
             time.sleep(1)

{splatlogger-1.2.1 → splatlogger-1.2.3}/src/splatlogger/tuples.py

@@ -6,11 +6,10 @@ import threading
 from dataclasses import dataclass, field
 from typing import NamedTuple, TYPE_CHECKING
 
-from .cemu_gecko import CemuGecko
-from .tcpgecko import TCPGecko
-
 if TYPE_CHECKING:
     from prompt_toolkit import PromptSession
+    from .cemu_gecko import CemuGecko
+    from .tcpgecko import TCPGecko
 
 
 class Options(NamedTuple):

{splatlogger-1.2.1 → splatlogger-1.2.3}/src/splatlogger/utility_functions.py

@@ -14,6 +14,7 @@ import requests
 from colorama import Fore, Style
 
 from .enums import Offsets
+from .errors import SplatloggerError
 from .tcpgecko import GeckoConnectionClosedError, GeckoReadMemError, TCPGeckoError
 from .tuples import AccountInfo, PlayerInfo
 
@@ -26,8 +27,8 @@ from cleantext import clean  # type: ignore[import-untyped]
 logging.disable(logging.NOTSET)
 
 
-def player_table_header(spfn: bool) -> str:
-    return f"{'Player':<8} | {'PID':<10} | {'SFID' if spfn else 'PNID':<16} | Name\n{'-' * 60}"
+def player_table_header(altendo: bool) -> str:
+    return f"{'Player':<8} | {'PID':<10} | {'ANID' if altendo else 'PNID':<16} | Name\n{'-' * 60}"
 
 
 def player_table_entry(player_info: PlayerInfo, act_info: AccountInfo) -> str:
@@ -81,12 +82,12 @@ def handle_gecko_errors(func: Callable[..., Any]) -> Any:
     return wrapper
 
 
-def process_response(response: requests.Response, spfn: bool) -> tuple[str, str] | None:
+def process_response(response: requests.Response, altendo: bool) -> tuple[str, str] | None:
     try:
         root = ElementTree.fromstring(response.text)
         assert len(root) != 0
 
-        if spfn:
+        if altendo:
             user_id = root[0].find("out_id")
             assert isinstance(user_id, ElementTree.Element) and user_id.text is not None
 
@@ -139,7 +140,3 @@ def get_utc_offset(date: datetime) -> int:
         return 0
 
     return round(offset.total_seconds() / 3600)
-
-
-class SplatloggerError(Exception):
-    pass

splatlogger-1.2.1/src/Splatlogger.egg-info/requires.txt

@@ -1,7 +0,0 @@
-userpaths
-requests
-psutil
-pymemoryeditor>=2.0.0
-colorama
-clean-text
-prompt_toolkit

splatlogger-1.2.1/src/splatlogger/__main__.py

@@ -1,4 +0,0 @@
-from .cli import cli
-
-if __name__ == "__main__":
-    cli()