Ticket #620: titlesort.patch

libs/libmythtv/proglist.cpp

@@ -1328 +1328 @@
 
         bool operator()(const ProgramInfo *a, const ProgramInfo *b) 
         {
-            if (m_reverse)
-                return (a->sortTitle > b->sortTitle);
-            else
-                return (a->sortTitle < b->sortTitle);
-        }
+            if (a->sortTitle != b->sortTitle)
+            {
+                if (m_reverse)
+                    return (a->sortTitle > b->sortTitle);
+                else
+                    return (a->sortTitle < b->sortTitle);
+            }
 
-    private:
-        bool m_reverse;
-};
+            // Prefer recorded titles to recording to will record
+            // Return it so preferred program will occur first
+            if (a->recstatus == rsRecorded) return true;
+            if (b->recstatus == rsRecorded) return false;
 
-class plTimeSort
-{
-    public:
-        plTimeSort(bool reverseSort = false) {m_reverse = reverseSort;}
+            if (a->recstatus == rsRecording) return true;
+            if (b->recstatus == rsRecording) return false;
 
-        bool operator()(const ProgramInfo *a, const ProgramInfo *b) 
-        {
-            if (a->startts == b->startts)
-                return (a->chanid < b->chanid);
+            if (a->recstatus == rsWillRecord) return true;
+            if (b->recstatus == rsWillRecord) return false;
 
             if (m_reverse)
-                return (a->startts > b->startts);
+                return a->startts < b->startts;
             else
-                return (a->startts < b->startts);
+                return a->startts > b->startts;
         }
 
     private:
@@ -1494 +1493 @@
                      "INTERVAL '1' HOUR) ";
     }
 
-    if (titleSort && type == plTitle)
-        where += " GROUP BY subtitle ";
-    else if (type == plNewListings || titleSort)
-        where += " GROUP BY title ";
+    QString order = "";
+    if (reverseSort) order = " DESC ";
+    if (type == plNewListings)
+        where += " GROUP BY title ORDER BY program.starttime" + order + ", title" + order;
+    else
+    {
+        where += " GROUP BY channel.chanid, program.title, "
+                 "program.starttime  ";
 
+        if (titleSort)
+        {
+            if (type == plTitle)
+                where += " ORDER BY title" + order + ",subtitle" + order + ", program.starttime";
+            else
+                where += " ORDER BY title " + order + ", program.starttime";
+        }
+        else if (reverseSort)
+        {
+            where += QString(" ORDER BY program.starttime DESC, ") +
+            gContext->GetSetting("ChannelOrdering", "channum+0") + " DESC";
+        }
+    }
+
     schedList.FromScheduler();
     itemList.FromProgram(where, bindings, schedList);
 
-    if (titleSort || reverseSort)
+    if (titleSort) // Sort without The/A/An prefixes
     {
         ProgramInfo *s;
 
@@ -1519 +1536 @@
             sortedList.push_back(s);
         }
 
-        if (titleSort)
-            sort(sortedList.begin(), sortedList.end(),
-                 plTitleSort(reverseSort));
-        else
-            sort(sortedList.begin(), sortedList.end(),
-                 plTimeSort(reverseSort));
+        sort(sortedList.begin(), sortedList.end(),
+             plTitleSort(reverseSort));
 
         vector<ProgramInfo *>::iterator i = sortedList.begin();
+        QString prev = "";
         for (; i != sortedList.end(); i++)
-            itemList.append(*i);
+        {
+            ProgramInfo *s = *i;
+            if (s->sortTitle != prev)
+            {
+                prev = s->sortTitle;
+                itemList.append(*i);
+            }
+        }
     }
 
     if (curItem < 0 && itemList.count() > 0)