Skip to content

Revert "Fix hard coded user dir path" #237

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
TheMoonThatRises merged 1 commit into from
Sep 12, 2026
+8 −101
Merged

Revert "Fix hard coded user dir path" #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 3 additions & 18 deletions AKPlugin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,6 @@ private struct AKAppSettingsData: Codable {
var resizableAspectRatioHeight: Int?
}

private func akCurrentUserHomeDirectoryPath() -> String {
let userName = NSUserName()
if let homeDirectory = NSHomeDirectoryForUser(userName) {
return homeDirectory
}
return NSString(string: "~\(userName)").expandingTildeInPath
}

private func akSettingsURLForBundleIdentifier(_ bundleIdentifier: String) -> URL {
return URL(fileURLWithPath: akCurrentUserHomeDirectoryPath(), isDirectory: true)
.appendingPathComponent("Library", isDirectory: true)
.appendingPathComponent("Containers", isDirectory: true)
.appendingPathComponent("io.playcover.PlayCover", isDirectory: true)
.appendingPathComponent("App Settings")
.appendingPathComponent("\(bundleIdentifier).plist")
}

class AKPlugin: NSObject, Plugin {
required override init() {
super.init()
Expand Down Expand Up @@ -321,7 +304,9 @@ class AKPlugin: NSObject, Plugin {

fileprivate static var akAppSettingsData: AKAppSettingsData? = {
let bundleIdentifier = Bundle.main.bundleIdentifier ?? ""
let settingsURL = akSettingsURLForBundleIdentifier(bundleIdentifier)
let settingsURL = URL(fileURLWithPath: "/Users/\(NSUserName())/Library/Containers/io.playcover.PlayCover")
.appendingPathComponent("App Settings")
.appendingPathComponent("\(bundleIdentifier).plist")
guard let data = try? Data(contentsOf: settingsURL),
let decoded = try? PropertyListDecoder().decode(AKAppSettingsData.self, from: data) else {
return nil
Expand Down
2 changes: 1 addition & 1 deletion PlayTools/MysticRunes/PlayedAppleDB.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ class PlayKeychainDB: NSObject {
private func connectToDB() -> OpaquePointer? {
var sqlite3DB: OpaquePointer?
let bundleID = Bundle.main.infoDictionary?["CFBundleIdentifier"] as? String ?? "Shared"
let keychainDB = playCoverContainerBaseURL()
let keychainDB = URL(fileURLWithPath: "/Users/\(NSUserName())/Library/Containers/io.playcover.PlayCover")
.appendingPathComponent("PlayChain")
.appendingPathComponent("\(bundleID).db")

Expand Down
69 changes: 3 additions & 66 deletions PlayTools/PlayLoader.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@

#include <Foundation/Foundation.h>
#include <errno.h>
#include <limits.h>
#include <stdatomic.h>
#include <sys/sysctl.h>

#import "PlayLoader.h"
Expand Down Expand Up @@ -218,75 +216,14 @@ static OSStatus pt_SecKeyGeneratePair(CFDictionaryRef parameters, SecKeyRef *pub

static uint8_t ue_status = 0;

static void pt_copyCurrentUserHomeDirectory(char *buffer, size_t bufferSize) {
if (bufferSize == 0) {
return;
}

buffer[0] = '\0';

char executablePath[PATH_MAX];
uint32_t executablePathSize = sizeof(executablePath);
if (_NSGetExecutablePath(executablePath, &executablePathSize) == 0) {
static char const containerMarker[] = "/Library/Containers/io.playcover.PlayCover/";
char *marker = strstr(executablePath, containerMarker);
if (marker != NULL) {
size_t homePathLength = (size_t)(marker - executablePath);
if (homePathLength > 0 && homePathLength < bufferSize) {
memcpy(buffer, executablePath, homePathLength);
buffer[homePathLength] = '\0';
return;
}
}
}

char const *homeDirectory = getenv("HOME");
if (homeDirectory != NULL && homeDirectory[0] != '\0') {
static char const containerSuffix[] = "/Library/Containers/io.playcover.PlayCover";
char const *suffix = strstr(homeDirectory, containerSuffix);
if (suffix != NULL) {
size_t homePathLength = (size_t)(suffix - homeDirectory);
if (homePathLength > 0 && homePathLength < bufferSize) {
memcpy(buffer, homeDirectory, homePathLength);
buffer[homePathLength] = '\0';
return;
}
}

snprintf(buffer, bufferSize, "%s", homeDirectory);
return;
}

char userName[256];
if (getlogin_r(userName, sizeof(userName)) == 0) {
snprintf(buffer, bufferSize, "/Users/%s", userName);
}
}

static char const* ue_fix_filename(char const* filename) {
static char uePattern[PATH_MAX];
static atomic_int uePatternState = 0; // 0 = uninitialized, 1 = initializing, 2 = ready, 3 = unavailable
int expectedState = 0;
if (atomic_compare_exchange_strong(&uePatternState, &expectedState, 1)) {
char homePath[PATH_MAX];
pt_copyCurrentUserHomeDirectory(homePath, sizeof(homePath));
if (homePath[0] != '\0') {
snprintf(uePattern, sizeof(uePattern), "/%s", homePath);
atomic_store(&uePatternState, 2);
} else {
atomic_store(&uePatternState, 3);
}
}

int patternState = atomic_load(&uePatternState);
if (patternState != 2 || uePattern[0] == '\0') {
return filename;
}
static char UE_PATTERN[1024] = "//Users/";
getlogin_r(UE_PATTERN + 8, sizeof(UE_PATTERN) - 8);

char const* p = filename;
if (ue_status == 2) {
char const* last_p = p;
while ((p = strstr(p, uePattern))) {
while ((p = strstr(p, UE_PATTERN))) {
last_p = ++p;
}

Expand Down
17 changes: 1 addition & 16 deletions PlayTools/PlaySettings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,6 @@ import UIKit

let settings = PlaySettings.shared

func playCoverUserHomeDirectoryPath() -> String {
let userName = NSUserName()
if let homeDirectory = NSHomeDirectoryForUser(userName) {
return homeDirectory
}
return NSString(string: "~\(userName)").expandingTildeInPath
}

func playCoverContainerBaseURL() -> URL {
URL(fileURLWithPath: playCoverUserHomeDirectoryPath(), isDirectory: true)
.appendingPathComponent("Library", isDirectory: true)
.appendingPathComponent("Containers", isDirectory: true)
.appendingPathComponent("io.playcover.PlayCover", isDirectory: true)
}

@objc public final class PlaySettings: NSObject {
@objc public static let shared = PlaySettings()

Expand All @@ -26,7 +11,7 @@ func playCoverContainerBaseURL() -> URL {
var settingsData: AppSettingsData

override init() {
settingsUrl = playCoverContainerBaseURL()
settingsUrl = URL(fileURLWithPath: "/Users/\(NSUserName())/Library/Containers/io.playcover.PlayCover")
.appendingPathComponent("App Settings")
.appendingPathComponent("\(bundleIdentifier).plist")
do {
Expand Down
Loading