fix: can not show backup file in File Manager

Change-Id: Iaaa2c41235e6384d5df1fe69744f513642ef0957
linuxdeepin · Apr 19, 2018 · d670fa6 · d670fa6
1 parent b6e9dc5
commit d670fa6
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 6 deletions.
diff --git a/app/src/widgets/mainwindow.cpp b/app/src/widgets/mainwindow.cpp
@@ -180,6 +180,30 @@ QString findHonestChild()
     return QStandardPaths::findExecutable("deepin-clone-honest");
 }
 
+bool MainWindow::showFileItem(const QString &file)
+{
+    QString honest_child = findHonestChild();
+
+    if (honest_child.isEmpty())
+        return false;
+
+    QProcess process;
+    QStringList env_list = process.environment();
+
+    env_list << honestChildEnvironment();
+    env_list << QString("%1=%2").arg(DEEPIN_CLONE_SHOW_FILE).arg(file);
+
+    process.setProcessChannelMode(QProcess::ForwardedChannels);
+    process.setEnvironment(env_list);
+
+    process.start(honest_child);
+
+    if (!process.waitForFinished())
+        return false;
+
+    return process.exitCode() == 0;
+}
+
 bool MainWindow::openUrl(const QUrl &url)
 {
     QString honest_child = findHonestChild();
@@ -698,9 +722,7 @@ void MainWindow::onButtonClicked()
         return setStatus(Working);
     }
     case ShowBackupFile: {
-        dCDebug("Show \"%s\" on file manager", qPrintable(m_targetFile));
-
-        DDesktopServices::showFileItem(m_targetFile);
+        dCDebug("Show \"%s\" on file manager. finished: %s", qPrintable(m_targetFile), showFileItem(m_targetFile) ? "true" : "false");
         return;
     }
     case Quit: {

diff --git a/app/src/widgets/mainwindow.h b/app/src/widgets/mainwindow.h
@@ -71,6 +71,8 @@ class MainWindow : public DMainWindow
 
     void startWithFile(const QString &source, const QString &target);
 
+    static bool showFileItem(const QString &file);
+
 private slots:
     bool openUrl(const QUrl &url);
 

diff --git a/common.pri b/common.pri
@@ -5,4 +5,5 @@ DEFINES += DEEPIN_CLONE_UID=\\\"DEEPIN_CLONE_UID\\\"\
            DEEPIN_CLONE_TITLE=\\\"DEEPIN_CLONE_TITLE\\\"\
            DEEPIN_CLONE_FILE_NAME=\\\"DEEPIN_CLONE_FILE_NAME\\\"\
            DEEPIN_CLONE_NAME_FILTER=\\\"DEEPIN_CLONE_NAME_FILTER\\\"\
-           DEEPIN_CLONE_GET_FILE=\\\"DEEPIN_CLONE_GET_FILE\\\"
+           DEEPIN_CLONE_GET_FILE=\\\"DEEPIN_CLONE_GET_FILE\\\"\
+           DEEPIN_CLONE_SHOW_FILE=\\\"DEEPIN_CLONE_SHOW_FILE\\\"
diff --git a/honest_child/honest_child.pro b/honest_child/honest_child.pro
@@ -3,6 +3,9 @@ VERSION = 0.0.1
 TEMPLATE = app
 QT += widgets
 
+CONFIG += link_pkgconfig
+PKGCONFIG += dtkwidget
+
 DEFINES += QT_MESSAGELOGCONTEXT
 DEFINES += HOST_ARCH_$$QMAKE_HOST.arch HOST_ARCH=\\\"$$QMAKE_HOST.arch\\\"
 

diff --git a/honest_child/main.cpp b/honest_child/main.cpp
@@ -25,6 +25,8 @@
 #include <QDebug>
 #include <QThread>
 
+#include <DDesktopServices>
+
 #include <unistd.h>
 #include <stdio.h>
 
@@ -55,9 +57,8 @@ int main(int argc, char *argv[])
         setuid(uid);
     }
 
-    QApplication *app = new QApplication(argc, argv);
-
     if (qEnvironmentVariableIsSet(DEEPIN_CLONE_OPEN_DIALOG)) {
+        QApplication *app = new QApplication(argc, argv);
         QFileDialog dialog(0, QString(), QDir::homePath());
 
         dialog.setWindowFlags(dialog.windowFlags() | Qt::WindowStaysOnTopHint);
@@ -91,7 +92,13 @@ int main(int argc, char *argv[])
         thread->wait();
         thread->quit();
     } else if (qEnvironmentVariableIsSet(DEEPIN_CLONE_OPEN_URL)) {
+        QGuiApplication *app = new QGuiApplication(argc, argv);
+        Q_UNUSED(app)
         QDesktopServices::openUrl(QUrl(QString::fromUtf8(qgetenv(DEEPIN_CLONE_OPEN_URL))));
+    } else if (qEnvironmentVariableIsSet(DEEPIN_CLONE_SHOW_FILE)) {
+        DTK_WIDGET_NAMESPACE::DDesktopServices::showFileItem(QString::fromUtf8(qgetenv(DEEPIN_CLONE_SHOW_FILE)));
+    } else {
+        return -1;
     }
 
     return 0;