fix: wrong path when last import path is empty

Change-Id: Ia66a9d2295f642dbfc7bc8dc61186213d5106d1d
linuxdeepin · Feb 18, 2019 · 1b489a5 · 1b489a5
1 parent 1d90bb9
commit 1b489a5
Showing 1 changed file with 19 additions and 15 deletions.
diff --git a/src/music-player/view/mainframe.cpp b/src/music-player/view/mainframe.cpp
@@ -95,6 +95,7 @@ class MainFramePrivate
     void updateViewname(const QString &vm);
     void updateTitlebarViewname(const QString &vm);
     void overrideTitlebarStyle();
+    const QString getLastImportPath() const;
 
     //! ui: show info dialog
     void showInfoDialog(const MetaPtr meta);
@@ -539,6 +540,22 @@ void MainFramePrivate::overrideTitlebarStyle()
     }
 }
 
+const QString MainFramePrivate::getLastImportPath() const
+{
+    QString lastImportPath = MusicSettings::value("base.play.last_import_path").toString();
+
+    QDir lastImportDir = QDir(lastImportPath);
+    if (!lastImportDir.exists() || lastImportPath.isEmpty()) {
+        lastImportPath =  QStandardPaths::standardLocations(QStandardPaths::MusicLocation).first();
+    } else {
+        // blumia: always use the path from QDir, QDir also accept relative path string and it will pass
+        //         the `QDir::exists()` checking
+        lastImportPath = lastImportDir.absolutePath();
+    }
+
+    return lastImportPath;
+}
+
 void MainFramePrivate::showInfoDialog(const MetaPtr meta)
 {
     infoDialog->show();
@@ -985,16 +1002,7 @@ void MainFrame::onSelectImportDirectory()
     Q_D(const MainFrame);
     QFileDialog fileDlg(this);
 
-    auto lastImportPath = MusicSettings::value("base.play.last_import_path").toString();
-
-    QDir lastImportDir = QDir(lastImportPath);
-    if (!lastImportDir.exists() || lastImportPath.isEmpty()) {
-        lastImportPath =  QStandardPaths::standardLocations(QStandardPaths::MusicLocation).first();
-    } else {
-        // blumia: always use the path from QDir, QDir also accept relative path string and it will pass
-        //         the `QDir::exists()` checking
-        lastImportPath = lastImportDir.absolutePath();
-    }
+    QString lastImportPath = d->getLastImportPath();
 
     fileDlg.setDirectory(lastImportPath);
 
@@ -1012,12 +1020,8 @@ void MainFrame::onSelectImportFiles()
     Q_D(const MainFrame);
     QFileDialog fileDlg(this);
 
-    auto lastImportPath = MusicSettings::value("base.play.last_import_path").toString();
+    QString lastImportPath = d->getLastImportPath();
 
-    auto lastImportDir = QDir(lastImportPath);
-    if (!lastImportDir.exists()) {
-        lastImportPath =  QStandardPaths::standardLocations(QStandardPaths::MusicLocation).first();
-    }
     fileDlg.setDirectory(lastImportPath);
 
     QString selfilter = tr("All music") + (" (%1)");