Skip to content

Commit

Permalink
file picker
Browse files Browse the repository at this point in the history
  • Loading branch information
@altalk23
altalk23 committed Oct 8, 2023
1 parent 35c018e commit f57601d
Show file tree
Hide file tree
Showing 6 changed files with 203 additions and 144 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ set(GEODE_BIN_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
set(GEODE_LOADER_PATH ${CMAKE_CURRENT_SOURCE_DIR}/loader)
set(GEODE_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR})

include(cmake/GeodeFile.cmake)
include(cmake/Platform.cmake)
include(cmake/GeodeFile.cmake)
include(cmake/CPM.cmake)

if (PROJECT_IS_TOP_LEVEL AND NOT GEODE_BUILDING_DOCS)
Expand Down
3 changes: 3 additions & 0 deletions cmake/GeodeFile.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,9 @@ function(setup_geode_mod proname)
elseif (APPLE)
file(GLOB libs ${dir}/*.dylib)
list(APPEND libs_to_link ${libs})
elseif (ANDROID)
file(GLOB libs ${dir}/*.so)
list(APPEND libs_to_link ${libs})
else()
message(FATAL_ERROR "Library extension not defined on this platform")
endif()
Expand Down
15 changes: 15 additions & 0 deletions loader/include/Geode/utils/file.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,16 +244,31 @@ namespace geode::utils::file {

/**
* Prompt the user to pick a file using the system's file system picker
* @note Will not work on Android, use the callback version instead
* @param mode Type of file selection prompt to show
* @param options Picker options
*/
GEODE_DLL Result<ghc::filesystem::path> pickFile(PickMode mode, FilePickOptions const& options);

GEODE_DLL void pickFile(
PickMode mode, FilePickOptions const& options,
utils::MiniFunction<void(ghc::filesystem::path)> callback,
utils::MiniFunction<void()> failed = {}
);

/**
* Prompt the user to pick a bunch of files for opening using the system's file system picker
* @note Will not work on Android, use the callback version instead
* @param options Picker options
*/
GEODE_DLL Result<std::vector<ghc::filesystem::path>> pickFiles(FilePickOptions const& options);

GEODE_DLL void pickFiles(
FilePickOptions const& options,
utils::MiniFunction<void(std::vector<ghc::filesystem::path>)> callback,
utils::MiniFunction<void()> failed = {}
);

class GEODE_DLL FileWatchEvent : public Event {
protected:
ghc::filesystem::path m_path;
Expand Down
201 changes: 66 additions & 135 deletions loader/src/platform/android/crashlog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,159 +334,90 @@ static void handlerThread() {

static bool s_lastLaunchCrashed;

bool crashlog::setupPlatformHandler() {
auto pidFile = crashlog::getCrashLogDirectory() / "last-pid";
// bool crashlog::setupPlatformHandler() {
// auto pidFile = crashlog::getCrashLogDirectory() / "last-pid";

int lastPid = 0;
// int lastPid = 0;

if (ghc::filesystem::exists(pidFile)) {
// if (ghc::filesystem::exists(pidFile)) {

auto res = file::readString(pidFile);
if (!res) {
log::warn("Failed to read last-pid file: {}", res.error());
}
else {
lastPid = std::stoi(res.unwrap());
}
// auto res = file::readString(pidFile);
// if (!res) {
// log::warn("Failed to read last-pid file: {}", res.error());
// }
// else {
// lastPid = std::stoi(res.unwrap());
// }

std::error_code ec;
ghc::filesystem::remove(pidFile, ec);
// std::error_code ec;
// ghc::filesystem::remove(pidFile, ec);

if (ec) {
log::warn("Failed to remove last-pid file: {}", ec.message());
}
}
// if (ec) {
// log::warn("Failed to remove last-pid file: {}", ec.message());
// }
// }

auto res = file::writeString(pidFile, std::to_string(getpid()));
if (!res) {
log::warn("Failed to write last-pid file: {}", res.error());
}
// auto res = file::writeString(pidFile, std::to_string(getpid()));
// if (!res) {
// log::warn("Failed to write last-pid file: {}", res.error());
// }

lastPid = 1513;
// lastPid = 1513;


if (lastPid == 0) {
return true;
}
// if (lastPid == 0) {
// return true;
// }

// TODO: get logcat crash

std::string logcatCrash = R"RAW(
F/libc (31506): Fatal signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 0xccb00000 in tid 31584 (GLThread 215445), pid 31506 (.geode.launcher)
F/DEBUG (31618): *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
F/DEBUG (31618): Build fingerprint: 'samsung/j7y17ltexx/j7y17lte:9/PPR1.180610.011/J730FXWU8CUG1:user/release-keys'
F/DEBUG (31618): Revision: '7'
F/DEBUG (31618): ABI: 'arm'
F/DEBUG (31618): pid: 31506, tid: 31584, name: GLThread 215445 >>> com.geode.launcher <<<
F/DEBUG (31618): signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 0xccb00000
F/DEBUG (31618): r0 ccafffe0 r1 ccafffe4 r2 ffefb73c r3 00000000
F/DEBUG (31618): r4 00000000 r5 c7e4af50 r6 c7e49400 r7 3c888889
F/DEBUG (31618): r8 c2dcf000 r9 cf8a7000 r10 cd1c6800 r11 cf8a7000
F/DEBUG (31618): ip eff2b5f0 sp cd1c6680 lr c921095d pc efe9ef2c
F/DEBUG (31618):
F/DEBUG (31618): backtrace:
F/DEBUG (31618): #00 pc 00019f2c /system/lib/libc.so (memcpy+96)
F/DEBUG (31618): #01 pc 00336959 /data/app/com.robtopx.geometryjump-xzzAmj1_bAwPLWKGJk5srA==/lib/arm/libcocos2dcpp.so (offset 0x336000) (GJEffectManager::updateSpawnTriggers(float)+64)
F/DEBUG (31618): #02 pc 0021b279 /data/app/com.robtopx.geometryjump-xzzAmj1_bAwPLWKGJk5srA==/lib/arm/libcocos2dcpp.so (offset 0x219000) (PlayLayer::update(float)+480)
F/DEBUG (31618): #03 pc 00000617 <anonymous:ee06a000>
F/libc ( 836): Fatal signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 0xcd680000 in tid 901 (GLThread 215582), pid 836 (.geode.launcher)
F/DEBUG ( 933): *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
F/DEBUG ( 933): Build fingerprint: 'samsung/j7y17ltexx/j7y17lte:9/PPR1.180610.011/J730FXWU8CUG1:user/release-keys'
F/DEBUG ( 933): Revision: '7'
F/DEBUG ( 933): ABI: 'arm'
F/DEBUG ( 933): pid: 836, tid: 901, name: GLThread 215582 >>> com.geode.launcher <<<
F/DEBUG ( 933): signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 0xcd680000
F/DEBUG ( 933): r0 cd67ffd0 r1 cd67fff4 r2 ffe935fc r3 00000000
F/DEBUG ( 933): r4 00000000 r5 cc6fa350 r6 cc6f8800 r7 3c888889
F/DEBUG ( 933): r8 c2990300 r9 ed1e0600 r10 caec3800 r11 ed1e0600
F/DEBUG ( 933): ip eff2b5f0 sp caec3680 lr c94fe95d pc efe9ef30
F/DEBUG ( 933):
F/DEBUG ( 933): backtrace:
F/DEBUG ( 933): #00 pc 00019f30 /system/lib/libc.so (memcpy+100)
F/DEBUG ( 933): #01 pc 00336959 /data/app/com.robtopx.geometryjump-xzzAmj1_bAwPLWKGJk5srA==/lib/arm/libcocos2dcpp.so (offset 0x336000) (GJEffectManager::updateSpawnTriggers(float)+64)
F/DEBUG ( 933): #02 pc 0021b279 /data/app/com.robtopx.geometryjump-xzzAmj1_bAwPLWKGJk5srA==/lib/arm/libcocos2dcpp.so (offset 0x219000) (PlayLayer::update(float)+480)
F/DEBUG ( 933): #03 pc 00000617 <anonymous:ee06a000>
F/libc ( 1071): Fatal signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 0xc9c00000 in tid 1228 (GLThread 215607), pid 1071 (.geode.launcher)
F/DEBUG ( 1377): *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
F/DEBUG ( 1377): Build fingerprint: 'samsung/j7y17ltexx/j7y17lte:9/PPR1.180610.011/J730FXWU8CUG1:user/release-keys'
F/DEBUG ( 1377): Revision: '7'
F/DEBUG ( 1377): ABI: 'arm'
F/DEBUG ( 1377): pid: 1071, tid: 1228, name: GLThread 215607 >>> com.geode.launcher <<<
F/DEBUG ( 1377): signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 0xc9c00000
F/DEBUG ( 1377): r0 c9bfffe0 r1 c9bfffe4 r2 ffb862fc r3 00000000
F/DEBUG ( 1377): r4 00000000 r5 c1bf2b50 r6 c1bf1000 r7 3c888889
F/DEBUG ( 1377): r8 c7d34200 r9 ed1e6e00 r10 cd0d2800 r11 ed1e6e00
F/DEBUG ( 1377): ip eff2b5f0 sp cd0d2680 lr c900c95d pc efe9ef2c
F/DEBUG ( 1377):
F/DEBUG ( 1377): backtrace:
F/DEBUG ( 1377): #00 pc 00019f2c /system/lib/libc.so (memcpy+96)
F/DEBUG ( 1377): #01 pc 00336959 /data/app/com.robtopx.geometryjump-xzzAmj1_bAwPLWKGJk5srA==/lib/arm/libcocos2dcpp.so (offset 0x336000) (GJEffectManager::updateSpawnTriggers(float)+64)
F/DEBUG ( 1377): #02 pc 0021b279 /data/app/com.robtopx.geometryjump-xzzAmj1_bAwPLWKGJk5srA==/lib/arm/libcocos2dcpp.so (offset 0x219000) (PlayLayer::update(float)+480)
F/DEBUG ( 1377): #03 pc 00000617 <anonymous:edfa0000>
F/libc ( 1513): Fatal signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 0xc8500000 in tid 1658 (GLThread 215649), pid 1513 (.geode.launcher)
F/DEBUG ( 1752): *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
F/DEBUG ( 1752): Build fingerprint: 'samsung/j7y17ltexx/j7y17lte:9/PPR1.180610.011/J730FXWU8CUG1:user/release-keys'
F/DEBUG ( 1752): Revision: '7'
F/DEBUG ( 1752): ABI: 'arm'
F/DEBUG ( 1752): pid: 1513, tid: 1658, name: GLThread 215649 >>> com.geode.launcher <<<
F/DEBUG ( 1752): signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 0xc8500000
F/DEBUG ( 1752): r0 c84fffc0 r1 c84fffe4 r2 ffb13634 r3 00000008
F/DEBUG ( 1752): r4 00000000 r5 c83e0750 r6 c83dec00 r7 3c888889
F/DEBUG ( 1752): r8 e41cad00 r9 ed9fbc00 r10 cd38f800 r11 ed9fbc00
F/DEBUG ( 1752): ip 00000000 sp cd38f680 lr c951195d pc efe9ef30
F/DEBUG ( 1752):
F/DEBUG ( 1752): backtrace:
F/DEBUG ( 1752): #00 pc 00019f30 /system/lib/libc.so (memcpy+100)
F/DEBUG ( 1752): #01 pc 00336959 /data/app/com.robtopx.geometryjump-xzzAmj1_bAwPLWKGJk5srA==/lib/arm/libcocos2dcpp.so (offset 0x336000) (GJEffectManager::updateSpawnTriggers(float)+64)
F/DEBUG ( 1752): #02 pc 0021b279 /data/app/com.robtopx.geometryjump-xzzAmj1_bAwPLWKGJk5srA==/lib/arm/libcocos2dcpp.so (offset 0x219000) (PlayLayer::update(float)+480)
F/DEBUG ( 1752): #03 pc 00000617 <anonymous:ee06a000>
)RAW";

std::string crashTrace;
auto findLast = logcatCrash.find_last_of(fmt::format("pid {} (.geode.launcher)", lastPid));
if (findLast != std::string::npos) {
auto begin = logcatCrash.substr(0, findLast).find_last_of("F/libc");
if (begin != std::string::npos) {
crashTrace = logcatCrash.substr(begin);
}
}
else {
return true;
}
// // TODO: get logcat crash

auto text = crashlog::writeCrashlog(nullptr, "", crashTrace, "");
s_lastLaunchCrashed = true;

auto lastCrashedFile = crashlog::getCrashLogDirectory() / "last-crashed";
if (ghc::filesystem::exists(lastCrashedFile)) {
std::error_code ec;
ghc::filesystem::remove(lastCrashedFile, ec);

if (ec) {
log::warn("Failed to remove last-crashed file: {}", ec.message());
}
}
return true;
}
// std::string logcatCrash = R"RAW()RAW";

bool crashlog::didLastLaunchCrash() {
return s_lastLaunchCrashed;
}
// std::string crashTrace;
// auto findLast = logcatCrash.find_last_of(fmt::format("pid {} (.geode.launcher)", lastPid));
// if (findLast != std::string::npos) {
// auto begin = logcatCrash.substr(0, findLast).find_last_of("F/libc");
// if (begin != std::string::npos) {
// crashTrace = logcatCrash.substr(begin);
// }
// }
// else {
// return true;
// }

ghc::filesystem::path crashlog::getCrashLogDirectory() {
return dirs::getGeodeDir() / "crashlogs";
}
// auto text = crashlog::writeCrashlog(nullptr, "", crashTrace, "");
// s_lastLaunchCrashed = true;

// auto lastCrashedFile = crashlog::getCrashLogDirectory() / "last-crashed";
// if (ghc::filesystem::exists(lastCrashedFile)) {
// std::error_code ec;
// ghc::filesystem::remove(lastCrashedFile, ec);

// ghc::filesystem::path crashlog::getCrashLogDirectory() {
// return geode::dirs::getSaveDir();
// if (ec) {
// log::warn("Failed to remove last-crashed file: {}", ec.message());
// }
// }
// return true;
// }

// bool crashlog::setupPlatformHandler() {
// return false;
// bool crashlog::didLastLaunchCrash() {
// return s_lastLaunchCrashed;
// }

// bool crashlog::didLastLaunchCrash() {
// return false;
// ghc::filesystem::path crashlog::getCrashLogDirectory() {
// return dirs::getGeodeDir() / "crashlogs";
// }

ghc::filesystem::path crashlog::getCrashLogDirectory() {
return geode::dirs::getSaveDir();
}

bool crashlog::setupPlatformHandler() {
return false;
}

bool crashlog::didLastLaunchCrash() {
return false;
}

#endif
115 changes: 112 additions & 3 deletions loader/src/platform/android/util.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,118 @@ bool utils::file::openFolder(ghc::filesystem::path const& path) {
return false;
}

geode::Result<ghc::filesystem::path> utils::file::
pickFile(geode::utils::file::PickMode, geode::utils::file::FilePickOptions const&) {
return geode::Err("This function is currently unimplemented");

static utils::MiniFunction<void(ghc::filesystem::path)> s_fileCallback;
static utils::MiniFunction<void(std::vector<ghc::filesystem::path>)> s_filesCallback;
static utils::MiniFunction<void()> s_failedCallback;

extern "C"
JNIEXPORT void JNICALL Java_com_geode_launcher_utils_GeodeUtils_selectFileCallback(
JNIEnv *env,
jobject,
jstring data
) {
auto isCopy = jboolean();
auto dataStr = env->GetStringUTFChars(data, &isCopy);

log::debug("Selected file: {}", dataStr);

s_fileCallback(dataStr);
}

extern "C"
JNIEXPORT void JNICALL Java_com_geode_launcher_utils_GeodeUtils_selectFilesCallback(
JNIEnv *env,
jobject,
jobjectArray datas
) {
auto isCopy = jboolean();
auto count = env->GetArrayLength(datas);
auto result = std::vector<ghc::filesystem::path>();
for (int i = 0; i < count; i++) {
auto data = (jstring)env->GetObjectArrayElement(datas, i);
auto dataStr = env->GetStringUTFChars(data, &isCopy);
result.push_back(dataStr);

log::debug("Selected file {}: {}", i, dataStr);
}

s_filesCallback(result);
}

extern "C"
JNIEXPORT void JNICALL Java_com_geode_launcher_utils_GeodeUtils_failedCallback(
JNIEnv *env,
jobject
) {
if (s_failedCallback) s_failedCallback();
}

Result<ghc::filesystem::path> file::pickFile(file::PickMode mode, file::FilePickOptions const& options) {
return Err("Use the callback version");
}

void file::pickFile(
PickMode mode, FilePickOptions const& options,
utils::MiniFunction<void(ghc::filesystem::path)> callback,
utils::MiniFunction<void()> failed
) {
s_fileCallback = callback;
s_failedCallback = failed;

std::string method;
switch (mode) {
case file::PickMode::OpenFile:
method = "selectFile";
break;
case file::PickMode::SaveFile:
method = "createFile";
break;
case file::PickMode::OpenFolder:
method = "selectFolder";
break;
}

JniMethodInfo t;
if (JniHelper::getStaticMethodInfo(t, "com/geode/launcher/utils/GeodeUtils", method.c_str(), "(Ljava/lang/String;)Z")) {
jstring stringArg1 = t.env->NewStringUTF(options.defaultPath.value_or(ghc::filesystem::path()).string().c_str());

jboolean result = t.env->CallStaticBooleanMethod(t.classID, t.methodID, stringArg1);

t.env->DeleteLocalRef(stringArg1);
t.env->DeleteLocalRef(t.classID);
if (result) {
return;
}
}
if (s_failedCallback) s_failedCallback();
}

Result<std::vector<ghc::filesystem::path>> file::pickFiles(file::FilePickOptions const& options) {
return Err("Use the callback version");
}

void file::pickFiles(
FilePickOptions const& options,
utils::MiniFunction<void(std::vector<ghc::filesystem::path>)> callback,
utils::MiniFunction<void()> failed
) {
s_filesCallback = callback;
s_failedCallback = failed;

JniMethodInfo t;
if (JniHelper::getStaticMethodInfo(t, "com/geode/launcher/utils/GeodeUtils", "selectFiles", "(Ljava/lang/String;)Z")) {
jstring stringArg1 = t.env->NewStringUTF(options.defaultPath.value_or(ghc::filesystem::path()).string().c_str());

jboolean result = t.env->CallStaticBooleanMethod(t.classID, t.methodID, stringArg1);

t.env->DeleteLocalRef(stringArg1);
t.env->DeleteLocalRef(t.classID);
if (result) {
return;
}
}
if (s_failedCallback) s_failedCallback();
}

void geode::utils::game::launchLoaderUninstaller(bool deleteSaveData) {
Expand Down
Loading

0 comments on commit f57601d

Please sign in to comment.