Changeset 27 for lib/mpdparseutils.cpp

Timestamp:

01/02/08 18:53:53 (4 years ago)

Author:

sander

Message:

Some stupid bugs solved.

• The filename also can contain ":", so append as many elements as there are available
• While concatenating elements, only don't add a ":" before the first element

File:

• lib/mpdparseutils.cpp (modified) (3 diffs)

lib/mpdparseutils.cpp

@@ +1 @@
+#include <QtDebug>
 #include <QList>
 
@@ -71 +72 @@
 
         if(tokens.at(0) == "file") {
-            song->file = tokens.at(1);
+            for(qint32 j = 1; j < tokens.size(); j++) {
+                if(j != 1)
+                    song->file += QString::fromUtf8(":");
+                song->file += QString::fromUtf8(tokens.at(j));
+            }
             song->file = song->file.trimmed();
         } else if(tokens.at(0) == "Time") {
@@ -77 +82 @@
         } else if(tokens.at(0) == "Album") {
             for(qint32 j = 1; j < tokens.size(); j++) {
-                if(j != 1 && j != tokens.size() - 1)
-                    song->album += ":";
+                if(j != 1)
+                    song->album += QString::fromUtf8(":");
                 song->album += QString::fromUtf8(tokens.at(j));
             }
+            song->album = song->album.trimmed();
         } else if(tokens.at(0) == "Artist") {
             for(qint32 j = 1; j < tokens.size(); j++) {
-                if(j != 1 && j != tokens.size() - 1)
-                    song->artist += ":";
+                if(j != 1)
+                    song->artist += QString::fromUtf8(":");
                 song->artist += QString::fromUtf8(tokens.at(j));
             }
+            song->artist = song->artist.trimmed();
         } else if(tokens.at(0) == "Title") {
             for(qint32 j = 1; j < tokens.size(); j++) {
-                if(j != 1 && j != tokens.size() - 1)
-                    song->title += ":";
+                if(j != 1)
+                    song->title += QString::fromUtf8(":");
                 song->title += QString::fromUtf8(tokens.at(j));
             }
+            song->title = song->title.trimmed();
         } else if(tokens.at(0) == "Track") {
             song->track = tokens.at(1).toInt();