Skip to content

macOS compatibility #2

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

Open
qwerasd205 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

macOS compatibility #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a2b824
Merge from JsSucks/master
qwerasd205 Mar 8, 2019
7cec695
Fixed typo'd variable name
qwerasd205 Mar 8, 2019
967c939
Fixed extractTarGz function
qwerasd205 Mar 8, 2019
2f50187
Restricted line that causes error when compiling on macOS to Windows
qwerasd205 Mar 8, 2019
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
4 changes: 3 additions & 1 deletion src/remotefile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ class RemoteFile final : public QObject {
QDir basePath() const { return _basePath; }
QString localFilePath() const { return _localFilePath; }
bool localFileExists() const { return QFile(_localFilePath).exists(); }
QFile &localFile() const { return QFile(_localFilePath); }
#if defined(Q_OS_WIN)
QFile &localFile() const { return QFile(_localFilePath); }
#endif
bool isMemoryOnly() const { return _memoryOnly; }
QString errorMsg() const { return _error; }
QByteArray bytes() const { return _bytes; }
Expand Down
27 changes: 15 additions & 12 deletions src/zip.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,21 +88,24 @@ void Zip::extract(const QString &out) {
}

void Zip::extractTarGz() {
auto gzProcess = new QProcess(this);
QStringList gzArgs{ "-zxf", _in };
Logger::Debug(_extractProgram + " " + gzArgs.join(" "));
auto gzProcess = new QProcess(this);

connect(gzProcess, static_cast<void(QProcess:: *)(int, QProcess::ExitStatus)>(&QProcess::finished), [=](int exitCode, QProcess::ExitStatus exitStatus) {
delete gzProcess;
emit extracted(true);
});
if(!QDir(_out).exists()) {
if(!QDir(_out).mkpath(".")) {
Logger::Debug("cannot create: " + _out);
}
}

gzProcess->start(_extractProgram, gzArgs);
QStringList gzArgs{ "-zxf", _in, "-C", _out };
Logger::Debug(_extractProgram + " " + gzArgs.join(" "));

if(!gzProcess->waitForStarted()) {
Logger::Debug("gzProcess failed to start!");
emit extracted(false);
}
connect(gzProcess, static_cast<void(QProcess:: *)(int, QProcess::ExitStatus)>(&QProcess::finished), [=](int exitCode, QProcess::ExitStatus exitStatus) {
delete gzProcess;
_extracted = true;
emit extracted(true);
});

gzProcess->start(_extractProgram, gzArgs);
}
#else
void Zip::extract() {
Expand Down
2 changes: 1 addition & 1 deletion src/zip.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Zip final : public QObject {
#if defined(Q_OS_WIN)
QString _extractProgram = "7za.exe";
#elif defined(Q_OS_DARWIN)
QString _extractProgtam = "tar";
QString _extractProgram = "tar";
#else
#endif

Expand Down