playlist import/export: use const directory configkey

mixxxdj · Nov 24, 2021 · aa72e10 · aa72e10
1 parent 53749d2
commit aa72e10
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/src/library/baseplaylistfeature.cpp b/src/library/baseplaylistfeature.cpp
@@ -23,6 +23,13 @@
 #include "widget/wlibrary.h"
 #include "widget/wlibrarytextbrowser.h"
 
+namespace {
+
+const ConfigKey kConfigKeyLastImportExportPlaylistDirectory(
+        "[Library]", "LastImportExportPlaylistDirectory");
+
+} // anonymous namespace
+
 BasePlaylistFeature::BasePlaylistFeature(
         Library* pLibrary,
         UserSettingsPointer pConfig,
@@ -358,7 +365,7 @@ void BasePlaylistFeature::slotImportPlaylist() {
 
     // Update the import/export playlist directory
     QFileInfo fileName(playlist_file);
-    m_pConfig->set(ConfigKey("[Library]", "LastImportExportPlaylistDirectory"),
+    m_pConfig->set(kConfigKeyLastImportExportPlaylistDirectory,
             ConfigValue(fileName.dir().absolutePath()));
 
     slotImportPlaylistFile(playlist_file);
@@ -404,7 +411,7 @@ void BasePlaylistFeature::slotCreateImportPlaylist() {
 
     // Set last import directory
     QFileInfo fileName(playlist_files.first());
-    m_pConfig->set(ConfigKey("[Library]", "LastImportExportPlaylistDirectory"),
+    m_pConfig->set(kConfigKeyLastImportExportPlaylistDirectory,
             ConfigValue(fileName.dir().absolutePath()));
 
     int lastPlaylistId = -1;
@@ -456,7 +463,7 @@ void BasePlaylistFeature::slotExportPlaylist() {
     qDebug() << "Export playlist" << playlistName;
 
     QString lastPlaylistDirectory = m_pConfig->getValue(
-            ConfigKey("[Library]", "LastImportExportPlaylistDirectory"),
+            kConfigKeyLastImportExportPlaylistDirectory,
             QStandardPaths::writableLocation(QStandardPaths::MusicLocation));
 
     // Open a dialog to let the user choose the file location for playlist export.
@@ -477,7 +484,7 @@ void BasePlaylistFeature::slotExportPlaylist() {
     }
     QFileInfo fileName(fileLocation);
     // Update the import/export playlist directory
-    m_pConfig->set(ConfigKey("[Library]", "LastImportExportPlaylistDirectory"),
+    m_pConfig->set(kConfigKeyLastImportExportPlaylistDirectory,
             ConfigValue(fileName.dir().absolutePath()));
 
     // The user has picked a new directory via a file dialog. This means the

diff --git a/src/library/crate/cratefeature.cpp b/src/library/crate/cratefeature.cpp
@@ -37,6 +37,9 @@ QString formatLabel(
         crateSummary.getTrackDurationText());
 }
 
+const ConfigKey kConfigKeyLastImportExportCrateDirectoryKey(
+        "[Library]", "LastImportExportCrateDirectory");
+
 } // anonymous namespace
 
 CrateFeature::CrateFeature(Library* pLibrary,
@@ -571,8 +574,8 @@ void CrateFeature::slotImportPlaylist() {
 
     // Update the import/export crate directory
     QFileInfo fileName(playlist_file);
-    m_pConfig->set(ConfigKey("[Library]","LastImportExportCrateDirectory"),
-                   ConfigValue(fileName.dir().absolutePath()));
+    m_pConfig->set(kConfigKeyLastImportExportCrateDirectoryKey,
+            ConfigValue(fileName.dir().absolutePath()));
 
     slotImportPlaylistFile(playlist_file);
     activateChild(m_lastRightClickedIndex);
@@ -611,8 +614,8 @@ void CrateFeature::slotCreateImportCrate() {
 
     // Set last import directory
     QFileInfo fileName(playlist_files.first());
-    m_pConfig->set(ConfigKey("[Library]","LastImportExportCrateDirectory"),
-                ConfigValue(fileName.dir().absolutePath()));
+    m_pConfig->set(kConfigKeyLastImportExportCrateDirectoryKey,
+            ConfigValue(fileName.dir().absolutePath()));
 
     CrateId lastCrateId;
 
@@ -684,7 +687,7 @@ void CrateFeature::slotExportPlaylist() {
     }
 
     QString lastCrateDirectory = m_pConfig->getValue(
-            ConfigKey("[Library]", "LastImportExportCrateDirectory"),
+            kConfigKeyLastImportExportCrateDirectoryKey,
             QStandardPaths::writableLocation(QStandardPaths::MusicLocation));
 
     QString fileFilter = tr("M3U Playlist (*.m3u)");
@@ -702,8 +705,8 @@ void CrateFeature::slotExportPlaylist() {
     }
     QFileInfo fileName(fileLocation);
     // Update the import/export crate directory
-    m_pConfig->set(ConfigKey("[Library]","LastImportExportCrateDirectory"),
-                ConfigValue(fileName.dir().absolutePath()));
+    m_pConfig->set(kConfigKeyLastImportExportCrateDirectoryKey,
+            ConfigValue(fileName.dir().absolutePath()));
 
     // The user has picked a new directory via a file dialog. This means the
     // system sandboxer (if we are sandboxed) has granted us permission to this