Skip to content

fix: under AppImage, fix the plugins loading dir #73

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
speed47 merged 1 commit into from
Jun 29, 2026
Merged

fix: under AppImage, fix the plugins loading dir #73

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
53 changes: 44 additions & 9 deletions lib/qpxscan/qpx_scan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,48 @@ char* dlerror() {
#include <sys/types.h>
#include <dirent.h>

#include <set>
#include <string>
#include <vector>

// #include <qpx_scan.h> // <-- moved above to avoid having to include <windows.h> twice
// #include <qpx_mmc.h> // <-- removed, already called in <qpx_scan.h>
#include <qpx_writer.h>
#include <plextor_features.h>

const char* FALLBACK_PLUGIN_NAME = "C2P"; // modernization

static std::vector<std::string> get_plugin_paths() {
std::vector<std::string> raw;
#if defined(__unix) || defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
const char* appdir = getenv("APPDIR");
if (appdir && *appdir) {
// When running from an AppImage, the APPDIR envvar is the AppDir root,
// plugins are bundled under $APPDIR/usr/lib(64)/qpxtool.
raw.push_back(std::string(appdir) + "/usr/lib/qpxtool");
raw.push_back(std::string(appdir) + "/usr/lib64/qpxtool");
return raw;
}
#endif
for (int i = 0; strlen(ppaths[i]); i++) raw.push_back(ppaths[i]);

// Deduplicate entries that resolve to the same directory.
std::vector<std::string> paths;
std::set<std::string> seen;
for (size_t i = 0; i < raw.size(); i++) {
std::string key = raw[i];
#if !defined(_WIN32) && !defined(_WIN64)
char* canon = realpath(raw[i].c_str(), NULL);
if (canon) {
key = canon;
free(canon);
}
#endif
if (seen.insert(key).second) paths.push_back(raw[i]);
}
return paths;
}

qscanner::qscanner(drive_info* idev) {
dev = idev;
writer = NULL;
Expand Down Expand Up @@ -191,10 +226,10 @@ int qscanner::plugins_probe(bool test, bool probe_enable) {
char* ppath;
DIR* dir;
struct dirent* dentry;
int i;
int r = 1;
for (i = 0; strlen(ppaths[i]) && !attached; i++) {
ppath = (char*)ppaths[i];
std::vector<std::string> plugin_paths = get_plugin_paths();
for (size_t i = 0; i < plugin_paths.size() && !attached; i++) {
ppath = (char*)plugin_paths[i].c_str();
if (!dev->silent) printf("Looking for plugins in %s...\n", ppath);
dir = opendir(ppath);
if (dir) {
Expand Down Expand Up @@ -236,12 +271,12 @@ int qscanner::plugins_probe_all(probe_result* results, int max_results) {
char* ppath;
DIR* dir;
struct dirent* dentry;
int i;
int count = 0;
bool was_silent = dev->silent;

for (i = 0; strlen(ppaths[i]) && count < max_results; i++) {
ppath = (char*)ppaths[i];
std::vector<std::string> plugin_paths = get_plugin_paths();
for (size_t i = 0; i < plugin_paths.size() && count < max_results; i++) {
ppath = (char*)plugin_paths[i].c_str();
if (!dev->silent) printf("Looking for plugins in %s...\n", ppath);
dir = opendir(ppath);
if (dir) {
Expand Down Expand Up @@ -293,12 +328,12 @@ int qscanner::plugin_attach(const char* name) { // modernization
char* ppath;
DIR* dir;
struct dirent* dentry;
int i;
int r = 1;
if (attached || !name) return 2;

for (i = 0; strlen(ppaths[i]) && !attached; i++) {
ppath = (char*)ppaths[i];
std::vector<std::string> plugin_paths = get_plugin_paths();
for (size_t i = 0; i < plugin_paths.size() && !attached; i++) {
ppath = (char*)plugin_paths[i].c_str();
if (!dev->silent) printf("Looking for plugins in %s...\n", ppath);
dir = opendir(ppath);
if (dir) {
Expand Down
Loading