Commit cb81bc75 authored by Jean-Francois Dockes's avatar Jean-Francois Dockes
Browse files

mediaserver: fix bug in service query caching

parent 47207f09
...@@ -44,8 +44,6 @@ ...@@ -44,8 +44,6 @@
#endif #endif
using namespace std; using namespace std;
using namespace std::placeholders;
//using json = nlohmann::json;
using namespace UPnPProvider; using namespace UPnPProvider;
class StreamHandle { class StreamHandle {
...@@ -407,7 +405,7 @@ static int resultToEntries(const string& encoded, vector<UpSong>& entries) ...@@ -407,7 +405,7 @@ static int resultToEntries(const string& encoded, vector<UpSong>& entries)
decodeResource(decoded[i], song.rsrc); decodeResource(decoded[i], song.rsrc);
// Possibly add resources from resource array if present // Possibly add resources from resource array if present
const Json::Value &resources = decoded[i]["resources"]; const Json::Value &resources = decoded[i]["resources"];
LOGDEB0("decoded['resources'] is type " << resources.type() << endl); LOGDEB1("decoded['resources'] is type " << resources.type() << endl);
if (resources.isArray()) { if (resources.isArray()) {
for (unsigned int i = 0; i < resources.size(); i++) { for (unsigned int i = 0; i < resources.size(); i++) {
song.resources.push_back(UpSong::Res()); song.resources.push_back(UpSong::Res());
...@@ -503,7 +501,9 @@ std::shared_ptr<ContentCacheEntry> ContentCache::get(const string& key) ...@@ -503,7 +501,9 @@ std::shared_ptr<ContentCacheEntry> ContentCache::get(const string& key)
purge(); purge();
auto it = m_cache.find(key); auto it = m_cache.find(key);
if (it != m_cache.end()) { if (it != m_cache.end()) {
LOGDEB0("ContentCache::get: found " << key << endl); ContentCacheEntry& entry = it->second;
LOGDEB0("ContentCache::get: found " << key << " offset " << entry.m_offset <<
" count " << entry.m_results.size() << "\n");
// we return a copy of the vector. Make our multi-access life simpler... // we return a copy of the vector. Make our multi-access life simpler...
return std::make_shared<ContentCacheEntry>(it->second); return std::make_shared<ContentCacheEntry>(it->second);
} }
...@@ -513,9 +513,10 @@ std::shared_ptr<ContentCacheEntry> ContentCache::get(const string& key) ...@@ -513,9 +513,10 @@ std::shared_ptr<ContentCacheEntry> ContentCache::get(const string& key)
ContentCacheEntry& ContentCache::set(const string& key, ContentCacheEntry &entry) ContentCacheEntry& ContentCache::set(const string& key, ContentCacheEntry &entry)
{ {
LOGDEB0("ContentCache::set: " << key << endl); LOGDEB0("ContentCache::set: " << key << " offset " << entry.m_offset <<
" count " << entry.m_results.size() << "\n");
m_cache[key] = entry; m_cache[key] = entry;
return entry; return m_cache[key];
} }
// Cache for searches // Cache for searches
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment