Ticket #2925: mythmusic-filenames-20070115.patch

configure

@@ -7 +7 @@
 #    default parameters for all plugins
 #
 
-prefix="/usr/local"
+prefix="/usr/"
 libdir_name="lib"
 
 music="yes"

mythmusic/mythmusic/cdrip.h

@@ -40 +40 @@
   private:
     int ripTrack(QString &cddevice, Encoder *encoder, int tracknum);
     static QString fixFileToken(QString token);
+    static QString fixFileToken_sl(QString token);
     void handleFileTokens(QString &filename, Metadata *track);
     void ejectCD(QString &cddev);
     bool isNewTune(QString &artist, QString &album, QString &title);

mythmusic/mythmusic/globalsettings.cpp

@@ -198 +198 @@
     gc->setValue("ARTIST/ALBUM/TRACK-TITLE"); // Don't translate
     gc->setHelpText(QObject::tr("Defines the location/name for new songs. "
                     "Valid tokens are: GENRE, ARTIST, ALBUM, "
-                    "TRACK, TITLE, YEAR, / and -. '-' will be replaced "
-                    "by the Token separator"));
+                    "TRACK, TITLE, YEAR"));
     return gc;
 };
 
+/*
 static HostLineEdit *TagSeparator()
 {
     HostLineEdit *gc = new HostLineEdit("TagSeparator");
@@ -212 +212 @@
                     "this string."));
     return gc;
 };
+*/
 
 static HostCheckBox *NoWhitespace()
 {
@@ -578 +579 @@
     rippersettings->setLabel(QObject::tr("CD Ripper Settings"));
     rippersettings->addChild(ParanoiaLevel());
     rippersettings->addChild(FilenameTemplate());
-    rippersettings->addChild(TagSeparator());
+    //rippersettings->addChild(TagSeparator());
     rippersettings->addChild(NoWhitespace());
     rippersettings->addChild(PostCDRipScript());
     rippersettings->addChild(EjectCD());

mythmusic/mythmusic/cdrip.cpp

@@ -531 +531 @@
 
 void Ripper::handleFileTokens(QString &filename, Metadata *track)
 {
-    QString original = filename;
-
+    QString musicdir = filename;
+    QDir directoryQD(musicdir);
+    filename = "";
     QString fntempl = gContext->GetSetting("FilenameTemplate");
     bool no_ws = gContext->GetNumSetting("NoWhitespace", 0);
 
     QRegExp rx_ws("\\s{1,}");
-    QRegExp rx("(?:\\s?)(GENRE|ARTIST|ALBUM|TRACK|TITLE|YEAR)(?:\\s?)/");
-
+    QRegExp rx("(GENRE|ARTIST|ALBUM|TRACK|TITLE|YEAR)");
     int i = 0;
+        int old_i = 0;
     while (i >= 0)
     {
         i = rx.search(fntempl, i);
         if (i >= 0)
         {
+                    if (i>0) filename += fixFileToken_sl(fntempl.mid(old_i,i-old_i));                   
             i += rx.matchedLength();
+                        old_i = i;
             if ((rx.capturedTexts()[1] == "GENRE") && (track->Genre() != ""))
-                filename += fixFileToken(track->Genre()) + "/";
+                filename += fixFileToken(track->Genre());
             if ((rx.capturedTexts()[1] == "ARTIST") && (track->FormatArtist() != ""))
-                filename += fixFileToken(track->FormatArtist()) + "/";
+                filename += fixFileToken(track->FormatArtist());
             if ((rx.capturedTexts()[1] == "ALBUM") && (track->Album() != ""))
-                filename += fixFileToken(track->Album()) + "/";
+                filename += fixFileToken(track->Album());
             if ((rx.capturedTexts()[1] == "TRACK") && (track->Track() >= 0))
-                filename += fixFileToken(QString::number(track->Track(), 10)) + "/";
+            {
+                QString tempstr = QString::number(track->Track(), 10);
+                if (track->Track() < 10)
+                    tempstr.prepend('0');
+                filename += fixFileToken(tempstr);
+            }
             if ((rx.capturedTexts()[1] == "TITLE") && (track->FormatTitle() != ""))
-                filename += fixFileToken(track->FormatTitle()) + "/";
-            if ((rx.capturedTexts()[1] == "YEAR") && (track->Year() >= 0))
-                filename += fixFileToken(QString::number(track->Year(), 10)) + "/";
-
-            if (no_ws)
-                filename.replace(rx_ws, "_");
-
-            mkdir(filename.local8Bit(), 0775);
-        }
+                filename += fixFileToken(track->FormatTitle());
+            if ((rx.capturedTexts()[1] == "YEAR") && (track->Year() > 0))
+                filename += fixFileToken(QString::number(track->Year(), 10));
+         }
     }
-
-    // remove the dir part and other cruft
-    fntempl.replace(QRegExp("(.*/)|\\s*"), "");
-    QString tagsep = gContext->GetSetting("TagSeparator");
-    QStringList tokens = QStringList::split("-", fntempl);
-    QStringList fileparts;
-    QString filepart;
-
-    for (unsigned i = 0; i < tokens.size(); i++)
+    if (no_ws)
+        filename.replace(rx_ws, "_");
+    if (filename == musicdir || filename.length() > FILENAME_MAX)
     {
-        if ((tokens[i] == "GENRE") && (track->Genre() != ""))
-            fileparts += track->Genre();
-        else if ((tokens[i] == "ARTIST") && (track->FormatArtist() != ""))
-            fileparts += track->FormatArtist();
-        else if ((tokens[i] == "ALBUM") && (track->Album() != ""))
-            fileparts += track->Album();
-        else if ((tokens[i] == "TRACK") && (track->Track() >= 0))
-        {
-            QString tempstr = QString::number(track->Track(), 10);
-            if (track->Track() < 10)
-                tempstr.prepend('0');
-            fileparts += tempstr;
-        }
-        else if ((tokens[i] == "TITLE") && (track->FormatTitle() != ""))
-            fileparts += track->FormatTitle();
-        else if ((tokens[i] == "YEAR") && (track->Year() >= 0))
-            fileparts += QString::number(track->Year(), 10);
-    }
-
-    filepart = fileparts.join( tagsep );
-    filename += fixFileToken(filepart);
-    
-    if (filename == original || filename.length() > FILENAME_MAX)
-    {
         QString tempstr = QString::number(track->Track(), 10);
         tempstr += " - " + track->FormatTitle();
-        filename += fixFileToken(tempstr);
+        filename = musicdir + fixFileToken(tempstr);
         VERBOSE(VB_GENERAL, QString("Invalid file storage definition."));
     }
-
-    if (no_ws)
-        filename.replace(rx_ws, "_");
+    filename=filename.local8Bit();    
+    
+    QStringList directoryList = QStringList::split("/", filename);
+    for (unsigned i = 0; i < (directoryList.size()-1); i++)
+    {
+        musicdir += "/" + directoryList[i];
+        umask(022);
+        directoryQD.mkdir(musicdir,TRUE);
+        directoryQD.cd(musicdir,TRUE);
+    }
+    filename=directoryQD.absPath()+"/"+directoryList.last();
 }
 
 inline QString Ripper::fixFileToken(QString token)
@@ -615 +596 @@
     return token;
 }
 
+inline QString Ripper::fixFileToken_sl(QString token)
+{
+        // this version doesn't remove fwd-slashes so we can pick them up later and create directories as required
+    token.replace(QRegExp("(\\\\|:|\'|\"|\\?|\\|)"), QString("_"));
+    return token;
+}
+
 void Ripper::reject() 
 {
     QString cddevice = gContext->GetSetting("CDDevice");