Improve handling of empty library and caching for async_browse

rajlaud · Oct 16, 2020 · e9f4238 · e9f4238
1 parent f602b85
commit e9f4238
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pysqueezebox/server.py b/pysqueezebox/server.py
@@ -290,7 +290,7 @@ async def async_get_category(self, category, limit=None, search=None):
             return await self.async_query_category(category, limit, search)
 
         status = await self.async_status()
-        if "lastscan" in status and self.__dict__[category]:
+        if "lastscan" in status and self.__dict__[category] is not None:
             if status["lastscan"] <= self.__dict__[category][0]:
                 _LOGGER.debug("Using cached category %s", category)
                 return self.__dict__[category][1]
@@ -306,8 +306,8 @@ async def async_get_category(self, category, limit=None, search=None):
             _LOGGER.debug("Category %s not set", category)
         result = await self.async_query_category(category)
         status = await self.async_status()
-        self.__dict__[category] = (status.get("lastscan"), result)
-        if limit:
+        self.__dict__[category] = (status.get("lastscan", 0), result)
+        if limit and self.__dict__[category][1] is not None:
             return self.__dict__[category][1][:limit]
         return self.__dict__[category][1]