Ticket #4430: mythmusic_rip_directory_v1_r15332.diff

mythplugins/mythmusic/mythmusic/globalsettings.cpp

@@ -34 +34 @@
     gc->setValue("/mnt/store/music/");
 #endif
     gc->setHelpText(QObject::tr("This directory must exist, and the user "
+                    "running MythMusic needs to have read permission "
+                    "to the directory."));
+    return gc;
+};
+
+static HostLineEdit *SetMusicRipDirectory()
+{
+    HostLineEdit *gc = new HostLineEdit("MusicRipLocation");
+    gc->setLabel(QObject::tr("Directory to rip music to"));
+#ifdef Q_WS_MACX
+    gc->setValue(QDir::homeDirPath() + "/Music");
+#else
+    gc->setValue("/mnt/store/music/");
+#endif
+    gc->setHelpText(QObject::tr("This directory must exist, and the user "
                     "running MythMusic needs to have write permission "
                     "to the directory."));
     return gc;
@@ -685 +700 @@
 {
     VerticalConfigurationGroup* rippersettings = new VerticalConfigurationGroup(false);
     rippersettings->setLabel(QObject::tr("CD Ripper Settings"));
+    rippersettings->addChild(SetMusicRipDirectory());
     rippersettings->addChild(ParanoiaLevel());
     rippersettings->addChild(FilenameTemplate());
     rippersettings->addChild(NoWhitespace());

mythplugins/mythmusic/mythmusic/cdrip.cpp

@@ -925 +925 @@
 // if createDir is true then the directory structure will be created
 QString Ripper::filenameFromMetadata(Metadata *track, bool createDir)
 {
-    QString musicdir = gContext->GetSetting("MusicLocation");
-    musicdir = QDir::cleanDirPath(musicdir);
-    if (!musicdir.endsWith("/"))
-        musicdir += "/";
+    // Fetch and cleanup the ripper directory setting
+    QString musicripdir = gContext->GetSetting("MusicRipLocation");
+    musicripdir = QDir::cleanDirPath(musicripdir);
+    if (!musicripdir.endsWith("/"))
+        musicripdir += "/";
 
-    QDir directoryQD(musicdir);
+    QDir directoryQD(musicripdir);
     QString filename = "";
     QString fntempl = gContext->GetSetting("FilenameTemplate");
     bool no_ws = gContext->GetNumSetting("NoWhitespace", 0);
@@ -977 +978 @@
     if (no_ws) 
         filename.replace(rx_ws, "_");
 
-    if (filename == musicdir || filename.length() > FILENAME_MAX) 
+    if (filename == musicripdir || filename.length() > FILENAME_MAX)
     {
         QString tempstr = QString::number(track->Track(), 10);
         tempstr += " - " + track->FormatTitle();
-        filename = musicdir + fixFileToken(tempstr);
+        filename = musicripdir + fixFileToken(tempstr);
         VERBOSE(VB_GENERAL, QString("Invalid file storage definition."));
     }
 
@@ -990 +991 @@
     QStringList directoryList = QStringList::split("/", filename);
     for (unsigned i = 0; i < (directoryList.size() - 1); i++)
     {
-        musicdir += "/" + directoryList[i];
+        musicripdir += "/" + directoryList[i];
         if (createDir)
         {
             umask(022);
-            directoryQD.mkdir(musicdir, true);
-            directoryQD.cd(musicdir, true);
+            directoryQD.mkdir(musicripdir, true);
+            directoryQD.cd(musicripdir, true);
         }
     }
 
-    filename = QDir::cleanDirPath(musicdir) + "/" + directoryList.last();
+    filename = QDir::cleanDirPath(musicripdir) + "/" + directoryList.last();
 
     return filename;
 }

mythtv/libs/libmythtv/dbcheck.cpp

@@ -11 +11 @@
 #include "datadirect.h" // for DataDirectProcessor::FixProgramIDs
 
 /// This is the DB schema version expected by the running MythTV instance.
-const QString currentDatabaseVersion = "1205";
+const QString currentDatabaseVersion = "1206";
 
 static bool UpdateDBVersionNumber(const QString &newnumber);
 static bool performActualUpdate(const QString updates[], QString version,
@@ -3351 +3351 @@
             return false;
     }
 
+    if (dbver == "1205")
+    {
+        const QString updates[] = {
+"INSERT INTO settings (value,data,hostname)"
+"SELECT 'MusicRipLocation', data, hostname FROM settings "
+"WHERE value='MusicLocation'; ",
+""
+};
+    if (!performActualUpdate(updates, "1206", dbver))
+            return false;
+    }
 
+
 //"ALTER TABLE cardinput DROP COLUMN preference;" in 0.22
 //"ALTER TABLE channel DROP COLUMN atscsrcid;" in 0.22
 //"ALTER TABLE recordedmarkup DROP COLUMN offset;" in 0.22