Merge lp:~humitos/encuentro/filter-comboboxes into lp:encuentro

[Manuel Kaufmann]

This is the old branch filter-by-section-channel but with some fixes to make it independant.

[Facundo Batista (facundo)]

The merge is conflicting in a trivial couple of lines.

After you fix that, please consider:

- Don't store channels or sections in the config: this is a problem for when they change (because of new data) where you'll need to merge, or discard elements, etc. It doesn't worth it. Just "calculate" the list of sections and channels when the data is loaded, at init time.

- Very related to the previous one: you need three structures: the curated list of channels, the curated list of sections, and a dict where for each channel you have the list of channels (and not build it in every change).

- This line...

    channels = sorted(list(set([e.channel for _, e in self.items()])))

  ...can be written like this...

    channels = sorted(set(e.channel for e in self.values()))

  ...which is simpler, faster, and easier to read.

- You have a "import pdb" in the middle of the code!!

- Maybe it's better to add the "Todas las secciones" item in the same place you're converting the set to a list (a couple of lines above). BTW, sort that list...

- You're not using real data when building the filter_section combobox.

- On on_channel_changed you also should call set_filter(), with the selected channel, and None as the section.

If you have any doubt, let's discuss in IRC.

The rest is very nice, I think it's good improvement to the UI.

Thank you very much!!

review: Needs Fixing

Unmerged revisions

229. By Manuel Kaufmann on 2014-09-03

ComboBoxes to filter by Channel and Section

=== modified file 'encuentro/data.py'
--- encuentro/data.py	2014-08-31 03:39:40 +0000
+++ encuentro/data.py	2014-09-03 13:13:03 +0000
@@ -26,6 +26,7 @@
 
 from encuentro import utils
 from encuentro.ui import dialogs
+from encuentro.config import config
 
 logger = logging.getLogger('encuentro.data')
 
@@ -148,7 +149,7 @@
         self.filename = filename
         self.downtype = downtype
 
-    def filter_params(self, text, only_downloaded):
+    def filter_params(self, text, only_downloaded, channel, section):
         """Return the filtering params.
 
         If should filter, it will return (pos1, pos2) (both in None if it only
@@ -158,15 +159,16 @@
             # need downloaded ones, sorry
             return
 
-        t = self.normalized_title
-        pos1 = t.find(text)
-        if pos1 == -1:
-            # need to match text, sorry
-            return
+        if channel in (self.channel, None) and section in (self.section, None):
+            t = self.normalized_title
+            pos1 = t.find(text)
+            if pos1 == -1:
+                # need to match text, sorry
+                return
 
-        # return boundaries
-        pos2 = pos1 + len(text)
-        return (pos1, pos2)
+            # return boundaries
+            pos2 = pos1 + len(text)
+            return (pos1, pos2)
 
     def __str__(self):
         args = (self.episode_id, self.state, self.channel,
@@ -300,6 +302,31 @@
         """Return the iter items of the data."""
         return self.data.iteritems()
 
+    def channels(self):
+        channels = config.get('channels', None)
+        if channels is None:
+            channels = sorted(list(set([e.channel for _, e in self.items()])))
+            config[config.SYSTEM]['channels'] = channels
+        channels.insert(0, u'Todos los canales')
+        return channels
+
+    def sections(self, channel):
+        sections = config.get('sections', None)
+        if sections is None:
+            sections = {}
+            for c in self.channels():
+                sections[c] = set()
+            for _, e in self.items():
+                    sections[e.channel].add(e.section)
+            for k in sections:
+                sections[k] = list(sections[k])
+            config[config.SYSTEM]['sections'] = sections
+        try:
+            sections[channel].insert(0, u'Todas las secciones')
+        except KeyError:
+            import ipdb;ipdb.set_trace()
+        return sections[channel]
+
     def save(self):
         """Save to disk."""
         to_save = (self.last_programs_version, self.data)

=== modified file 'encuentro/ui/central_panel.py'
--- encuentro/ui/central_panel.py	2014-08-26 01:57:46 +0000
+++ encuentro/ui/central_panel.py	2014-09-03 13:13:03 +0000
@@ -378,13 +378,15 @@
         for i in xrange(item.columnCount()):
             item.setBackgroundColor(i, color)
 
-    def set_filter(self, text, only_downloaded=False):
+    def set_filter(self, text, only_downloaded=False,
+                   channel=None, section=None):
         """Apply a filter to the episodes list."""
         text = data.prepare_to_filter(text)
         for episode_id, item in self._item_map.iteritems():
             episode = self.main_window.programs_data[episode_id]
 
-            params = episode.filter_params(text, only_downloaded)
+            params = episode.filter_params(
+                text, only_downloaded, channel, section)
             if params is None:
                 item.setHidden(True)
             else:

=== modified file 'encuentro/ui/main.py'
--- encuentro/ui/main.py	2014-05-02 14:03:39 +0000
+++ encuentro/ui/main.py	2014-09-03 13:13:03 +0000
@@ -32,6 +32,7 @@
 from PyQt4.QtGui import (
     QAction,
     QCheckBox,
+    QComboBox,
     QLabel,
     QLineEdit,
     QMessageBox,
@@ -244,6 +245,19 @@
         spacer = QWidget()
         spacer.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
         toolbar.addWidget(spacer)
+
+        self.filter_channel = QComboBox()
+        self.channels = self.programs_data.channels()
+        self.filter_channel.addItems(self.channels)
+        self.filter_channel.currentIndexChanged.connect(
+            self.on_channel_changed)
+        toolbar.addWidget(self.filter_channel)
+
+        self.filter_section = QComboBox()
+        self.filter_section.addItems([u'Todas las secciones'])
+        self.filter_section.currentIndexChanged.connect(self.on_filter_changed)
+        toolbar.addWidget(self.filter_section)
+
         toolbar.addWidget(QLabel(u"Filtro: "))
         self.filter_line = QLineEdit()
         self.filter_line.setMaximumWidth(150)
@@ -270,11 +284,30 @@
             dlg.exec_()
         self._review_need_something_indicator()
 
+    def _get_filter_channel(self):
+        if self.filter_channel.currentIndex() == 0:
+            return None
+        else:
+            return self.filter_channel.currentText()
+
+    def _get_filter_section(self):
+        if self.filter_section.currentIndex() == 0:
+            return None
+        else:
+            return self.filter_section.currentText()
+
+    def on_channel_changed(self, _):
+        self.filter_section.clear()
+        channel = self._get_filter_channel()
+        sections = self.programs_data.sections(channel)
+        self.filter_section.addItems(sections)
+
     def on_filter_changed(self, _):
         """The filter text has changed, apply it in the episodes list."""
         text = self.filter_line.text()
         cbox = self.filter_cbox.checkState()
-        self.episodes_list.set_filter(text, cbox)
+        self.episodes_list.set_filter(
+            text, cbox, self._get_filter_channel(), self._get_filter_section())
 
         # after applying filter, nothing is selected, so check buttons
         # (easiest way to clean them all)