Fixed minor bug with 'More' button

[someplayer] / src / tagresolver.cpp

diff --git a/src/tagresolver.cpp b/src/tagresolver.cpp
index 10bf0a6..25f0f65 100644 (file)
--- a/src/tagresolver.cpp
+++ b/src/tagresolver.cpp
@@ -18,10 +18,11 @@
  */
 
 #include "tagresolver.h"
-#include <QDebug>
 #include <QFile>
+#include <QFileInfo>
 #include <tag.h>
 #include <fileref.h>
+#include <QDebug>
 
 using namespace SomePlayer::DataObjects;
 
@@ -31,8 +32,9 @@ TagResolver::TagResolver(QObject *parent) :
 }
 
 void TagResolver::decode(QStringList files) {
+       emit started();
        foreach (QString filename, files) {
-               TagLib::FileRef file_ref(QFile::encodeName(filename).data());
+               TagLib::FileRef file_ref(QFile::encodeName(filename).data(), true, TagLib::AudioProperties::Fast);
                if (!file_ref.isNull()) {
                        TagLib::Tag *tag = file_ref.tag();
                        if (NULL != tag) {
@@ -42,10 +44,19 @@ void TagResolver::decode(QStringList files) {
                                                           QString::fromStdWString(tag->artist().toWString()),
                                                           QString::fromStdWString(tag->album().toWString()),
                                                           properties->length());
-                                       Track track(0, meta, filename);
+                                       meta.setYear(tag->year());
+                                       Track track(meta, filename);
                                        emit decoded(track);
                                }
                        }
+               } else { // workaround
+                       TrackMetadata meta;
+                       meta.setLength(0);
+                       QFileInfo fi(filename);
+                       meta.setArtist(fi.suffix().toUpper());
+                       meta.setTitle(fi.baseName());
+                       Track track(meta, filename);
+                       emit decoded(track);
                }
        }
        emit done();
@@ -63,3 +74,31 @@ void TagResolver::updateTags(Track track) {
                file_ref.save();
        }
 }
+
+Track TagResolver::decodeOne(QString filename) {
+       TagLib::FileRef file_ref(QFile::encodeName(filename).data(), true, TagLib::AudioProperties::Fast);
+       if (!file_ref.isNull()) {
+               TagLib::Tag *tag = file_ref.tag();
+               if (NULL != tag) {
+                       TagLib::AudioProperties *properties = file_ref.audioProperties();
+                       if (NULL != properties) {
+                               TrackMetadata meta(QString::fromStdWString(tag->title().toWString()),
+                                                  QString::fromStdWString(tag->artist().toWString()),
+                                                  QString::fromStdWString(tag->album().toWString()),
+                                                  properties->length());
+                               meta.setYear(tag->year());
+                               Track track(meta, filename);
+                               return track;
+                       }
+               }
+       } else { // workaround
+               TrackMetadata meta;
+               meta.setLength(0);
+               QFileInfo fi(filename);
+               meta.setArtist(fi.suffix().toUpper());
+               meta.setTitle(fi.baseName());
+               Track track(meta, filename);
+               return track;
+       }
+       return Track();
+}