mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

ytparser: create CURL object in constructor

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: dd7ff427f7
Author: martii <m4rtii@gmx.de>
Date: 2013-06-09 (Sun, 09 Jun 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-06-09 14:59:45 +02:00
committed by [CST] Focus
parent 742122d110
commit 576e7e44cd
2 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/system/ytparser.cpp
View File

@@ -90,22 +90,25 @@ cYTFeedParser::cYTFeedParser()
feedmode = -1; feedmode = -1;
tquality = "mqdefault"; tquality = "mqdefault";
max_results = 25; max_results = 25;
curl_handle = curl_easy_init();
} }
cYTFeedParser::~cYTFeedParser() cYTFeedParser::~cYTFeedParser()
{ {
curl_easy_cleanup(curl_handle);
} }
size_t cYTFeedParser::CurlWriteToString(void *ptr, size_t size, size_t nmemb, void *data) size_t cYTFeedParser::CurlWriteToString(void *ptr, size_t size, size_t nmemb, void *data)
{ {
if (size * nmemb > 0) {
std::string* pStr = (std::string*) data; std::string* pStr = (std::string*) data;
pStr->append((char*) ptr, nmemb); pStr->append((char*) ptr, nmemb);
}
return size*nmemb; return size*nmemb;
} }
bool cYTFeedParser::getUrl(std::string &url, std::string &answer, CURL *_curl_handle) bool cYTFeedParser::getUrl(std::string &url, std::string &answer)
{ {
CURL * curl_handle = _curl_handle ? _curl_handle : curl_easy_init();
curl_easy_setopt(curl_handle, CURLOPT_URL, url.c_str()); curl_easy_setopt(curl_handle, CURLOPT_URL, url.c_str());
curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, &cYTFeedParser::CurlWriteToString); curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, &cYTFeedParser::CurlWriteToString);
curl_easy_setopt(curl_handle, CURLOPT_FILE, (void *)&answer); curl_easy_setopt(curl_handle, CURLOPT_FILE, (void *)&answer);
@@ -119,9 +122,6 @@ bool cYTFeedParser::getUrl(std::string &url, std::string &answer, CURL *_curl_ha
printf("try to get [%s] ...\n", url.c_str()); printf("try to get [%s] ...\n", url.c_str());
CURLcode httpres = curl_easy_perform(curl_handle); CURLcode httpres = curl_easy_perform(curl_handle);
if (!_curl_handle)
curl_easy_cleanup(curl_handle);
printf("http: res %d size %d\n", httpres, answer.size()); printf("http: res %d size %d\n", httpres, answer.size());
if (httpres != 0 || answer.empty()) { if (httpres != 0 || answer.empty()) {
@@ -131,15 +131,15 @@ bool cYTFeedParser::getUrl(std::string &url, std::string &answer, CURL *_curl_ha
return true; return true;
} }
bool cYTFeedParser::DownloadUrl(std::string &url, std::string &file, CURL *_curl_handle) bool cYTFeedParser::DownloadUrl(std::string &url, std::string &file)
{ {
FILE * fp = fopen(file.c_str(), "wb"); FILE * fp = fopen(file.c_str(), "wb");
if (fp == NULL) { if (fp == NULL) {
perror(file.c_str()); perror(file.c_str());
return false; return false;
} }
CURL * curl_handle = _curl_handle ? _curl_handle : curl_easy_init();
curl_easy_setopt(curl_handle, CURLOPT_URL, url.c_str()); curl_easy_setopt(curl_handle, CURLOPT_URL, url.c_str());
curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, NULL);
curl_easy_setopt(curl_handle, CURLOPT_FILE, fp); curl_easy_setopt(curl_handle, CURLOPT_FILE, fp);
curl_easy_setopt(curl_handle, CURLOPT_FAILONERROR, 1); curl_easy_setopt(curl_handle, CURLOPT_FAILONERROR, 1);
curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, URL_TIMEOUT); curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, URL_TIMEOUT);
@@ -153,8 +153,6 @@ bool cYTFeedParser::DownloadUrl(std::string &url, std::string &file, CURL *_curl
double dsize; double dsize;
curl_easy_getinfo(curl_handle, CURLINFO_SIZE_DOWNLOAD, &dsize); curl_easy_getinfo(curl_handle, CURLINFO_SIZE_DOWNLOAD, &dsize);
if (!_curl_handle)
curl_easy_cleanup(curl_handle);
fclose(fp); fclose(fp);
printf("http: res %d size %f.\n", httpres, dsize); printf("http: res %d size %f.\n", httpres, dsize);
@@ -169,9 +167,7 @@ bool cYTFeedParser::DownloadUrl(std::string &url, std::string &file, CURL *_curl
void cYTFeedParser::decodeUrl(std::string &url) void cYTFeedParser::decodeUrl(std::string &url)
{ {
CURL * curl_handle = curl_easy_init();
char * str = curl_easy_unescape(curl_handle, url.c_str(), 0, NULL); char * str = curl_easy_unescape(curl_handle, url.c_str(), 0, NULL);
curl_easy_cleanup(curl_handle);
if(str) if(str)
url = str; url = str;
curl_free(str); curl_free(str);
@@ -179,9 +175,7 @@ void cYTFeedParser::decodeUrl(std::string &url)
void cYTFeedParser::encodeUrl(std::string &txt) void cYTFeedParser::encodeUrl(std::string &txt)
{ {
CURL * curl_handle = curl_easy_init();
char * str = curl_easy_escape(curl_handle, txt.c_str(), txt.length()); char * str = curl_easy_escape(curl_handle, txt.c_str(), txt.length());
curl_easy_cleanup(curl_handle);
if(str) if(str)
txt = str; txt = str;
curl_free(str); curl_free(str);
@@ -546,7 +540,6 @@ bool cYTFeedParser::ParseVideoInfo(cYTVideoInfo &vinfo)
estr.push_back("&el=vevo"); estr.push_back("&el=vevo");
estr.push_back("&el=detailpage"); estr.push_back("&el=detailpage");
CURL *curl_handle = curl_easy_init();
for (unsigned i = 0; i < estr.size(); i++) { for (unsigned i = 0; i < estr.size(); i++) {
std::string vurl = "http://www.youtube.com/get_video_info?video_id="; std::string vurl = "http://www.youtube.com/get_video_info?video_id=";
vurl += vinfo.id; vurl += vinfo.id;
@@ -554,13 +547,12 @@ bool cYTFeedParser::ParseVideoInfo(cYTVideoInfo &vinfo)
vurl += "&ps=default&eurl=&gl=US&hl=en"; vurl += "&ps=default&eurl=&gl=US&hl=en";
printf("cYTFeedParser::ParseVideoInfo: get [%s]\n", vurl.c_str()); printf("cYTFeedParser::ParseVideoInfo: get [%s]\n", vurl.c_str());
std::string answer; std::string answer;
if (!getUrl(vurl, answer, curl_handle)) if (!getUrl(vurl, answer))
continue; continue;
ret = decodeVideoInfo(answer, vinfo); ret = decodeVideoInfo(answer, vinfo);
if (ret) if (ret)
break; break;
} }
curl_easy_cleanup(curl_handle);
return ret; return ret;
} }
@@ -571,7 +563,6 @@ bool cYTFeedParser::DownloadThumbnails()
perror(thumbnail_dir.c_str()); perror(thumbnail_dir.c_str());
//return ret; //return ret;
} }
CURL *curl_handle = curl_easy_init();
for (unsigned i = 0; i < videos.size(); i++) { for (unsigned i = 0; i < videos.size(); i++) {
if (!videos[i].thumbnail.empty()) { if (!videos[i].thumbnail.empty()) {
std::string fname = thumbnail_dir; std::string fname = thumbnail_dir;
@@ -580,13 +571,12 @@ bool cYTFeedParser::DownloadThumbnails()
fname += ".jpg"; fname += ".jpg";
bool found = !access(fname.c_str(), F_OK); bool found = !access(fname.c_str(), F_OK);
if (!found) if (!found)
found = DownloadUrl(videos[i].thumbnail, fname, curl_handle); found = DownloadUrl(videos[i].thumbnail, fname);
if (found) if (found)
videos[i].tfile = fname; videos[i].tfile = fname;
ret |= found; ret |= found;
} }
} }
curl_easy_cleanup(curl_handle);
return ret; return ret;
} }

10
src/system/ytparser.h
View File

@@ -87,14 +87,16 @@ class cYTFeedParser
std::string getXmlAttr(xmlNodePtr node, const char * attr); std::string getXmlAttr(xmlNodePtr node, const char * attr);
std::string getXmlData(xmlNodePtr node); std::string getXmlData(xmlNodePtr node);
CURL *curl_handle;
static size_t CurlWriteToString(void *ptr, size_t size, size_t nmemb, void *data); static size_t CurlWriteToString(void *ptr, size_t size, size_t nmemb, void *data);
static void encodeUrl(std::string &txt); void encodeUrl(std::string &txt);
static void decodeUrl(std::string &url); void decodeUrl(std::string &url);
static void splitString(std::string &str, std::string delim, std::vector<std::string> &strlist, int start = 0); static void splitString(std::string &str, std::string delim, std::vector<std::string> &strlist, int start = 0);
static void splitString(std::string &str, std::string delim, std::map<std::string,std::string> &strmap, int start = 0); static void splitString(std::string &str, std::string delim, std::map<std::string,std::string> &strmap, int start = 0);
static bool saveToFile(const char * name, std::string str); static bool saveToFile(const char * name, std::string str);
bool getUrl(std::string &url, std::string &answer, CURL *curl_handle = NULL); bool getUrl(std::string &url, std::string &answer);
bool DownloadUrl(std::string &url, std::string &file, CURL *curl_handle = NULL); bool DownloadUrl(std::string &url, std::string &file);
bool parseFeedXml(std::string &answer); bool parseFeedXml(std::string &answer);
bool decodeVideoInfo(std::string &answer, cYTVideoInfo &vinfo); bool decodeVideoInfo(std::string &answer, cYTVideoInfo &vinfo);
bool supportedFormat(int fmt); bool supportedFormat(int fmt);