diff options
| -rw-r--r-- | src/msd/msd_browse.py | 2 | ||||
| -rw-r--r-- | src/msd/msd_generic_model.py | 9 | ||||
| -rw-r--r-- | src/msd/msd_search.py | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/msd/msd_browse.py b/src/msd/msd_browse.py index de677d3..2bb1b56 100644 --- a/src/msd/msd_browse.py +++ b/src/msd/msd_browse.py @@ -58,7 +58,7 @@ class BrowseModel(GenericModel): def __on_browse_reply (self, result): self._on_reply(result, self.__child_count) - def fetch_items(self, start, count): + def _fetch_items(self, start, count): sort_descriptor = self.__sort_order.get_upnp_sort_order() self.__root.list_children(start, count, GenericModel.filter, diff --git a/src/msd/msd_generic_model.py b/src/msd/msd_generic_model.py index da8b138..b13b9d1 100644 --- a/src/msd/msd_generic_model.py +++ b/src/msd/msd_generic_model.py @@ -21,8 +21,8 @@ # This is a base class for SearchModel and BrowseModel: # They need to implement: -# def fetch_items(self) -# which needs to make sure on_reply() or on_error() is called. +# def _fetch_items(self, start, count) +# which needs to make sure _on_reply() or _on_error() is called. import pygtk pygtk.require('2.0') @@ -179,12 +179,15 @@ class GenericModel(gtk.GenericTreeModel): self.__fetch_in_progress = False print "Fetch failed: %s" % error + def _fetch_items(self, start, count): + raise NotImplementedError + def __do_fetch (self): start = self.__request_start + self.__result_count count = min(self.__request_count - self.__result_count, GenericModel.max_items_per_fetch) # call virtual function, implemented by subclasses - self.fetch_items(start, count) + self._fetch_items(start, count) def __start_fetch(self, start, count): self.__fetch_in_progress = True diff --git a/src/msd/msd_search.py b/src/msd/msd_search.py index afa4c0e..82356c6 100644 --- a/src/msd/msd_search.py +++ b/src/msd/msd_search.py @@ -58,7 +58,7 @@ class SearchModel(GenericModel): return search_string - def fetch_items(self, start, count): + def _fetch_items(self, start, count): self.__root.search(self.__search_string, start, count, GenericModel.filter, |