mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 09:51:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/moviebrowser: caching fixes

Browse Source 
Conflicts:
	src/gui/moviebrowser.cpp
This commit is contained in:
martii
2013-11-16 12:23:48 +01:00
committed by [CST] Focus
parent 81ca577fb8
commit 891170490e
5 changed files with 101 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/gui/moviebrowser.cpp
View File

@@ -1100,6 +1100,7 @@ int CMovieBrowser::exec(const char* path)
} }
else if ((show_mode == MB_SHOW_YT) && (msg == CRCInput::RC_record) && m_movieSelectionHandler) else if ((show_mode == MB_SHOW_YT) && (msg == CRCInput::RC_record) && m_movieSelectionHandler)
{ {
m_movieSelectionHandler->source = (show_mode == MB_SHOW_YT) ? MI_MOVIE_INFO::YT : MI_MOVIE_INFO::NK;
if (cYTCache::getInstance()->addToCache(m_movieSelectionHandler)) { if (cYTCache::getInstance()->addToCache(m_movieSelectionHandler)) {
const char *format = g_Locale->getText(LOCALE_MOVIEBROWSER_YT_CACHE_ADD); const char *format = g_Locale->getText(LOCALE_MOVIEBROWSER_YT_CACHE_ADD);
char buf[1024]; char buf[1024];
@@ -3762,27 +3763,29 @@ neutrino_locale_t CMovieBrowser::getFeedLocale(void)
int CYTCacheSelectorTarget::exec(CMenuTarget* /*parent*/, const std::string & actionKey) int CYTCacheSelectorTarget::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
{ {
MI_MOVIE_INFO::miSource source = (movieBrowser->show_mode == MB_SHOW_YT) ? MI_MOVIE_INFO::YT : MI_MOVIE_INFO::NK;
int selected = movieBrowser->yt_menue->getSelected(); int selected = movieBrowser->yt_menue->getSelected();
if (actionKey == "cancel_all") { if (actionKey == "cancel_all") {
cYTCache::getInstance()->cancelAll(); cYTCache::getInstance()->cancelAll(source);
} else if (actionKey == "completed_clear") { } else if (actionKey == "completed_clear") {
cYTCache::getInstance()->clearCompleted(); cYTCache::getInstance()->clearCompleted(source);
} else if (actionKey == "failed_clear") { } else if (actionKey == "failed_clear") {
cYTCache::getInstance()->clearFailed(); cYTCache::getInstance()->clearFailed(source);
} else if (actionKey == "rc_spkr" && selected >= movieBrowser->yt_pending_offset && selected < movieBrowser->yt_completed_offset) { } else if (actionKey == "rc_spkr" && movieBrowser->yt_pending_offset && selected >= movieBrowser->yt_pending_offset && selected < movieBrowser->yt_pending_end) {
cYTCache::getInstance()->cancel(&movieBrowser->yt_pending[selected - movieBrowser->yt_pending_offset]); cYTCache::getInstance()->cancel(&movieBrowser->yt_pending[selected - movieBrowser->yt_pending_offset]);
} else if (actionKey == "rc_spkr" && selected >= movieBrowser->yt_completed_offset && selected < movieBrowser->yt_failed_offset) { } else if (actionKey == "rc_spkr" && movieBrowser->yt_completed_offset && selected >= movieBrowser->yt_completed_offset && selected < movieBrowser->yt_completed_end) {
cYTCache::getInstance()->remove(&movieBrowser->yt_completed[selected - movieBrowser->yt_completed_offset]); cYTCache::getInstance()->remove(&movieBrowser->yt_completed[selected - movieBrowser->yt_completed_offset]);
} else if (actionKey == "") { } else if (actionKey == "") {
if (movieBrowser->yt_pending_offset && selected >= movieBrowser->yt_pending_offset && selected < movieBrowser->yt_completed_offset) { if (movieBrowser->yt_pending_offset && selected >= movieBrowser->yt_pending_offset && selected < movieBrowser->yt_pending_end) {
if(ShowMsg (LOCALE_MOVIEBROWSER_YT_CACHE, g_Locale->getText(LOCALE_MOVIEBROWSER_YT_CANCEL_TRANSFER), CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes) if(ShowMsg (LOCALE_MOVIEBROWSER_YT_CACHE, g_Locale->getText(LOCALE_MOVIEBROWSER_YT_CANCEL_TRANSFER), CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes)
cYTCache::getInstance()->cancel(&movieBrowser->yt_pending[selected - movieBrowser->yt_pending_offset]); cYTCache::getInstance()->cancel(&movieBrowser->yt_pending[selected - movieBrowser->yt_pending_offset]);
else else
return menu_return::RETURN_NONE; return menu_return::RETURN_NONE;
} else if (movieBrowser->yt_completed_offset && selected >= movieBrowser->yt_completed_offset && selected < movieBrowser->yt_failed_offset) { } else if (movieBrowser->yt_completed_offset && selected >= movieBrowser->yt_completed_offset && selected < movieBrowser->yt_completed_end) {
// FIXME -- anything sensible to do here? // FIXME -- anything sensible to do here?
return menu_return::RETURN_NONE; return menu_return::RETURN_NONE;
} else if (movieBrowser->yt_failed_offset && selected >= movieBrowser->yt_failed_offset && selected < movieBrowser->yt_menue->getItemsCount()){ } else if (movieBrowser->yt_failed_offset && selected >= movieBrowser->yt_failed_offset && selected < movieBrowser->yt_failed_end){
cYTCache::getInstance()->clearFailed(&movieBrowser->yt_failed[selected - movieBrowser->yt_failed_offset]); cYTCache::getInstance()->clearFailed(&movieBrowser->yt_failed[selected - movieBrowser->yt_failed_offset]);
cYTCache::getInstance()->addToCache(&movieBrowser->yt_failed[selected - movieBrowser->yt_failed_offset]); cYTCache::getInstance()->addToCache(&movieBrowser->yt_failed[selected - movieBrowser->yt_failed_offset]);
const char *format = g_Locale->getText(LOCALE_MOVIEBROWSER_YT_CACHE_ADD); const char *format = g_Locale->getText(LOCALE_MOVIEBROWSER_YT_CACHE_ADD);
@@ -3808,13 +3811,17 @@ void CMovieBrowser::refreshYTMenu()
delete m; delete m;
yt_menue->removeItem(item_id); yt_menue->removeItem(item_id);
} }
yt_pending = cYTCache::getInstance()->getPending(); MI_MOVIE_INFO::miSource source = (show_mode == MB_SHOW_YT) ? MI_MOVIE_INFO::YT : MI_MOVIE_INFO::NK;
yt_completed = cYTCache::getInstance()->getCompleted(); yt_pending = cYTCache::getInstance()->getPending(source);
yt_failed = cYTCache::getInstance()->getFailed(); yt_completed = cYTCache::getInstance()->getCompleted(source);
yt_failed = cYTCache::getInstance()->getFailed(source);
yt_pending_offset = 0; yt_pending_offset = 0;
yt_completed_offset = 0; yt_completed_offset = 0;
yt_failed_offset = 0; yt_failed_offset = 0;
yt_pending_end = 0;
yt_completed_end = 0;
yt_failed_end = 0;
if (!yt_pending.empty()) { if (!yt_pending.empty()) {
yt_menue->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MOVIEBROWSER_YT_PENDING)); yt_menue->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MOVIEBROWSER_YT_PENDING));
@@ -3825,6 +3832,7 @@ void CMovieBrowser::refreshYTMenu()
for (std::vector<MI_MOVIE_INFO>::iterator it = yt_pending.begin(); it != yt_pending.end(); ++it, ++i) { for (std::vector<MI_MOVIE_INFO>::iterator it = yt_pending.begin(); it != yt_pending.end(); ++it, ++i) {
yt_menue->addItem(new CMenuForwarder((*it).file.Name.c_str(), true, NULL, ytcache_selector)); yt_menue->addItem(new CMenuForwarder((*it).file.Name.c_str(), true, NULL, ytcache_selector));
} }
yt_pending_end = yt_menue->getItemsCount();
} }
if (!yt_completed.empty()) { if (!yt_completed.empty()) {
@@ -3836,6 +3844,7 @@ void CMovieBrowser::refreshYTMenu()
for (std::vector<MI_MOVIE_INFO>::iterator it = yt_completed.begin(); it != yt_completed.end(); ++it, ++i) { for (std::vector<MI_MOVIE_INFO>::iterator it = yt_completed.begin(); it != yt_completed.end(); ++it, ++i) {
yt_menue->addItem(new CMenuForwarder((*it).file.Name.c_str(), true, NULL, ytcache_selector)); yt_menue->addItem(new CMenuForwarder((*it).file.Name.c_str(), true, NULL, ytcache_selector));
} }
yt_completed_end = yt_menue->getItemsCount();
} }
if (!yt_failed.empty()) { if (!yt_failed.empty()) {
@@ -3847,6 +3856,7 @@ void CMovieBrowser::refreshYTMenu()
for (std::vector<MI_MOVIE_INFO>::iterator it = yt_failed.begin(); it != yt_failed.end(); ++it, ++i) { for (std::vector<MI_MOVIE_INFO>::iterator it = yt_failed.begin(); it != yt_failed.end(); ++it, ++i) {
yt_menue->addItem(new CMenuForwarder((*it).file.Name.c_str(), true, NULL, ytcache_selector)); yt_menue->addItem(new CMenuForwarder((*it).file.Name.c_str(), true, NULL, ytcache_selector));
} }
yt_failed_end = yt_menue->getItemsCount();
} }
CFrameBuffer::getInstance()->Clear(); // due to possible width change CFrameBuffer::getInstance()->Clear(); // due to possible width change

3
src/gui/moviebrowser.h
View File

@@ -346,6 +346,9 @@ class CMovieBrowser : public CMenuTarget
int yt_pending_offset; int yt_pending_offset;
int yt_completed_offset; int yt_completed_offset;
int yt_failed_offset; int yt_failed_offset;
int yt_pending_end;
int yt_completed_end;
int yt_failed_end;
std::vector<MI_MOVIE_INFO> yt_pending; std::vector<MI_MOVIE_INFO> yt_pending;
std::vector<MI_MOVIE_INFO> yt_completed; std::vector<MI_MOVIE_INFO> yt_completed;
std::vector<MI_MOVIE_INFO> yt_failed; std::vector<MI_MOVIE_INFO> yt_failed;

3
src/gui/movieinfo.h
View File

@@ -179,6 +179,9 @@ class MI_MOVIE_INFO
std::string ytdate; // yt published std::string ytdate; // yt published
std::string ytid; // yt published std::string ytid; // yt published
int ytitag; // youtube quality profile int ytitag; // youtube quality profile
enum miSource { UNKNOWN = 0, YT, NK };
miSource source;
}; };
typedef std::vector<MI_MOVIE_INFO> MI_MOVIE_LIST; typedef std::vector<MI_MOVIE_INFO> MI_MOVIE_LIST;

86
src/system/ytcache.cpp
View File

@@ -30,7 +30,7 @@
#if LIBCURL_VERSION_NUM < 0x071507 #if LIBCURL_VERSION_NUM < 0x071507
#include <curl/types.h> #include <curl/types.h>
#endif #endif
#define URL_TIMEOUT 60 #define URL_TIMEOUT 3600
#include "helpers.h" #include "helpers.h"
#include "settings.h" #include "settings.h"
@@ -59,16 +59,19 @@ cYTCache *cYTCache::getInstance(void)
std::string cYTCache::getName(MI_MOVIE_INFO *mi, std::string ext) std::string cYTCache::getName(MI_MOVIE_INFO *mi, std::string ext)
{ {
char ytitag[10]; switch (mi->source) {
snprintf(ytitag, sizeof(ytitag), "%d", mi->ytitag); case MI_MOVIE_INFO::YT:
return g_settings.downloadcache_dir + "/" + mi->ytid + "-" + std::string(ytitag) + "." + ext; return g_settings.downloadcache_dir + "/" + mi->ytid + "-" + to_string(mi->ytitag) + "." + ext;
case MI_MOVIE_INFO::NK:
return g_settings.downloadcache_dir + "/nk-" + mi->ytid + "." + ext;
default:
return "";
}
} }
bool cYTCache::getNameIfExists(std::string &fname, const std::string &id, int itag, std::string ext) bool cYTCache::getNameIfExists(std::string &fname, const std::string &id, int itag, std::string ext)
{ {
char ytitag[10]; std::string f = g_settings.downloadcache_dir + "/" + id + "-" + to_string(itag) + "." + ext;
snprintf(ytitag, sizeof(ytitag), "%d", itag);
std::string f = g_settings.downloadcache_dir + "/" + id + "-" + std::string(ytitag) + "." + ext;
if (access(f, R_OK)) if (access(f, R_OK))
return false; return false;
fname = f; fname = f;
@@ -148,12 +151,15 @@ bool cYTCache::download(MI_MOVIE_INFO *mi)
} }
} }
fprintf (stderr, "downloading %s to %s\n", mi->file.Url.c_str(), file.c_str());
CURLcode res = curl_easy_perform(curl); CURLcode res = curl_easy_perform(curl);
curl_easy_cleanup(curl); curl_easy_cleanup(curl);
fclose(fp); fclose(fp);
if (res) { if (res) {
fprintf (stderr, "downloading %s to %s failed: %s\n", mi->file.Url.c_str(), file.c_str(), cerror);
unlink(file.c_str()); unlink(file.c_str());
return false; return false;
} }
@@ -261,16 +267,21 @@ void cYTCache::remove(MI_MOVIE_INFO *mi)
} }
} }
void cYTCache::cancelAll(void) void cYTCache::cancelAll(MI_MOVIE_INFO::miSource source)
{ {
{ {
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex); OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
if (pending.empty()) if (pending.empty())
return; return;
if (pending.size() > 1) { if (pending.size() > 1)
failed.insert(failed.end(), pending.begin() + 1, pending.end()); for (std::vector<MI_MOVIE_INFO>::iterator it = pending.begin() + 1; it != pending.end();)
pending.erase(pending.begin() + 1, pending.end()); if ((*it).source == source) {
} failed.push_back(*it);
it = pending.erase(it);
} else
++it;
if (pending.front().source != source)
return;
} }
cancelled = true; cancelled = true;
@@ -280,28 +291,43 @@ void cYTCache::cancelAll(void)
{ {
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex); OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
cancelled = false; cancelled = false;
pending.clear(); if (pending.size() > 0) {
if (pthread_create(&thread, NULL, downloadThread, this)) {
perror("pthread_create");
return;
}
pthread_detach(thread);
}
} }
} }
std::vector<MI_MOVIE_INFO> cYTCache::getFailed(void) std::vector<MI_MOVIE_INFO> cYTCache::getFailed(MI_MOVIE_INFO::miSource source)
{ {
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex); OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
std::vector<MI_MOVIE_INFO> res = failed; std::vector<MI_MOVIE_INFO> res;
for (std::vector<MI_MOVIE_INFO>::iterator it = failed.begin(); it != failed.end(); ++it)
if ((*it).source == source)
res.push_back(*it);
return res; return res;
} }
std::vector<MI_MOVIE_INFO> cYTCache::getCompleted(void) std::vector<MI_MOVIE_INFO> cYTCache::getCompleted(MI_MOVIE_INFO::miSource source)
{ {
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex); OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
std::vector<MI_MOVIE_INFO> res = completed; std::vector<MI_MOVIE_INFO> res;
for (std::vector<MI_MOVIE_INFO>::iterator it = completed.begin(); it != completed.end(); ++it)
if ((*it).source == source)
res.push_back(*it);
return res; return res;
} }
std::vector<MI_MOVIE_INFO> cYTCache::getPending(void) std::vector<MI_MOVIE_INFO> cYTCache::getPending(MI_MOVIE_INFO::miSource source)
{ {
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex); OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
std::vector<MI_MOVIE_INFO> res = pending; std::vector<MI_MOVIE_INFO> res;
for (std::vector<MI_MOVIE_INFO>::iterator it = pending.begin(); it != pending.end(); ++it)
if ((*it).source == source)
res.push_back(*it);
return res; return res;
} }
@@ -331,7 +357,27 @@ void cYTCache::clearCompleted(MI_MOVIE_INFO *mi)
completed.clear(); completed.clear();
} }
void cYTCache::clearFailed(MI_MOVIE_INFO::miSource source)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
for (std::vector<MI_MOVIE_INFO>::iterator it = failed.begin(); it != failed.end();)
if ((*it).source == source)
it = failed.erase(it);
else
++it;
}
void cYTCache::clearCompleted(MI_MOVIE_INFO::miSource source)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
for (std::vector<MI_MOVIE_INFO>::iterator it = completed.begin(); it != completed.end();)
if ((*it).source == source)
it = completed.erase(it);
else
++it;
}
bool cYTCache::compareMovieInfo(MI_MOVIE_INFO *a, MI_MOVIE_INFO *b) bool cYTCache::compareMovieInfo(MI_MOVIE_INFO *a, MI_MOVIE_INFO *b)
{ {
return a->ytid == b->ytid && a->ytitag == b->ytitag; return a->ytid == b->ytid && a->ytitag == b->ytitag && a->source == b->source;
} }

14
src/system/ytcache.h
View File

@@ -54,12 +54,14 @@ class cYTCache
bool addToCache(MI_MOVIE_INFO *mi); bool addToCache(MI_MOVIE_INFO *mi);
void cancel(MI_MOVIE_INFO *mi); void cancel(MI_MOVIE_INFO *mi);
void remove(MI_MOVIE_INFO *mi); void remove(MI_MOVIE_INFO *mi);
void cancelAll(void); void cancelAll(MI_MOVIE_INFO::miSource = MI_MOVIE_INFO::YT);
std::vector<MI_MOVIE_INFO> getCompleted(void); std::vector<MI_MOVIE_INFO> getCompleted(MI_MOVIE_INFO::miSource = MI_MOVIE_INFO::YT);
std::vector<MI_MOVIE_INFO> getFailed(void); std::vector<MI_MOVIE_INFO> getFailed(MI_MOVIE_INFO::miSource = MI_MOVIE_INFO::YT);
std::vector<MI_MOVIE_INFO> getPending(void); std::vector<MI_MOVIE_INFO> getPending(MI_MOVIE_INFO::miSource = MI_MOVIE_INFO::YT);
void clearCompleted(MI_MOVIE_INFO *mi = NULL); void clearCompleted(MI_MOVIE_INFO *mi);
void clearFailed(MI_MOVIE_INFO *mi = NULL); void clearFailed(MI_MOVIE_INFO *mi);
void clearCompleted(MI_MOVIE_INFO::miSource source = MI_MOVIE_INFO::YT);
void clearFailed(MI_MOVIE_INFO::miSource source = MI_MOVIE_INFO::YT);
bool getNameIfExists(std::string &fname, const std::string &id, int itag, std::string ext = ".jpg"); bool getNameIfExists(std::string &fname, const std::string &id, int itag, std::string ext = ".jpg");
}; };
#endif #endif