refactor; reuse QNapiSubtitleInfo ordering in opensubtitle engine

qnapi.pro

@@ -53,7 +53,8 @@ SOURCES += src/main.cpp \
     src/subconvert/subtitleformat.cpp \
     src/libmediainfomovieinfoparser.cpp \
     src/qsubpostprocess.cpp \
-    src/forms/subdatawidget.cpp
+    src/forms/subdatawidget.cpp \
+    src/qnapisubtitleinfo.cpp
 
 
 HEADERS += src/engines/qnapiabstractengine.h \

src/engines/qopensubtitlesengine.cpp

@@ -21,6 +21,8 @@
 #include <QDir>
 #include <QMessageBox>
 
+#include <QDebug>
+
 // konstruktor klasy
 QOpenSubtitlesEngine::QOpenSubtitlesEngine()
     : rpc(QUrl(openSubtitlesXmlRpcUrl))
@@ -195,23 +197,7 @@ bool QOpenSubtitlesEngine::lookForSubtitles(QString lang)
 // wyniki wyszukiwania
 QList<QNapiSubtitleInfo> QOpenSubtitlesEngine::listSubtitles()
 {
-    QList<QNapiSubtitleInfo> good, unknown, bad;
-
-    foreach(QNapiSubtitleInfo n, subtitlesList)
-    {
-        switch(n.resolution)
-        {
-            case SUBTITLE_GOOD: good << n; break;
-            case SUBTITLE_UNKNOWN: unknown << n; break;
-            case SUBTITLE_BAD: bad << n; break;
-            case SUBTITLE_NONE:break;
-        }
-    }
-
-    subtitlesList.clear();
-
-    subtitlesList << good << unknown << bad;
-
+    std::sort(subtitlesList.begin(), subtitlesList.end());
     return subtitlesList;
 }
 

src/forms/frmsummary.cpp

@@ -28,7 +28,7 @@ frmSummary::frmSummary(QWidget * parent, Qt::WindowFlags f) : QDialog(parent, f)
     move(position.topLeft());
 }
 
-void frmSummary::setSummaryList(QList<QNapiSubtitleInfo> &list)
+void frmSummary::setSummaryList(QList<QNapiSubtitleInfo> list)
 {
     std::sort(list.begin(), list.end());
 

src/forms/frmsummary.h

@@ -30,9 +30,9 @@ class frmSummary: public QDialog
 Q_OBJECT
     public:
         frmSummary(QWidget *parent = 0, Qt::WindowFlags f = 0);
-        ~frmSummary() {};
+        ~frmSummary() {}
 
-        void setSummaryList(QList<QNapiSubtitleInfo> &list);
+        void setSummaryList(QList<QNapiSubtitleInfo> list);
 
     private:
         Ui::frmSummary ui;

src/qnapisubtitleinfo.cpp

@@ -0,0 +1,16 @@
+#include "qnapisubtitleinfo.h"
+#include <algorithm>
+#include <vector>
+
+bool QNapiSubtitleInfo::operator<(const QNapiSubtitleInfo& other) const
+{
+    std::vector<QString> v1 = { QString::number(other.resolution), name };
+    std::vector<QString> v2 = { QString::number(resolution), other.name };
+
+    return std::lexicographical_compare(v1.begin(), v1.end(), v2.begin(), v2.end());
+}
+
+QNapiSubtitleInfo QNapiSubtitleInfo::fromFailed(QString name)
+{
+    return QNapiSubtitleInfo("", "", "", name, "" ,"", SUBTITLE_NONE);
+}

src/qnapisubtitleinfo.h

@@ -16,6 +16,7 @@
 #define __QNAPISUBTITLEINFO__H__
 
 #include <QUuid>
+#include <QMetaType>
 
 // Orientacyjne okreslenie czy napisy na pewno pasuja lub nie do naszego filmu
 enum QNapiSubtitleResolution
@@ -32,8 +33,9 @@ enum QNapiSubtitleResolution
 };
 
 // struktura opisujaca napisy
-struct QNapiSubtitleInfo
+class QNapiSubtitleInfo
 {
+public:
     QNapiSubtitleInfo(QString _lang = "",
                       QString _engine = "",
                       QString _sourceLocation = "",
@@ -59,13 +61,9 @@ struct QNapiSubtitleInfo
     QNapiSubtitleResolution resolution;
     QUuid id;
 
-    bool operator<(const QNapiSubtitleInfo& other) const {
-        return resolution > other.resolution;
-    }
+    bool operator<(const QNapiSubtitleInfo& other) const;
 
-    static QNapiSubtitleInfo fromFailed(QString name) {
-        return QNapiSubtitleInfo("", "", "",name, "" ,"", SUBTITLE_NONE);
-    }
+    static QNapiSubtitleInfo fromFailed(QString name);
 };
 
 Q_DECLARE_METATYPE(QNapiSubtitleInfo);