mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-12 07:53:37 +02:00
imdb/tmdb: code formatations using astyle
Origin commit data
------------------
Commit: 751fd1f536
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-04-08 (Thu, 08 Apr 2021)
Origin message was:
------------------
- imdb/tmdb: code formatations using astyle
This commit is contained in:
vanhofen
@@ -42,10 +42,10 @@
|
||||
#include <global.h>
|
||||
#include "mdb-tmdb.h"
|
||||
|
||||
CTMDB* CTMDB::getInstance()
|
||||
CTMDB *CTMDB::getInstance()
|
||||
{
|
||||
static CTMDB* tmdb = NULL;
|
||||
if(!tmdb)
|
||||
static CTMDB *tmdb = NULL;
|
||||
if (!tmdb)
|
||||
tmdb = new CTMDB();
|
||||
return tmdb;
|
||||
}
|
||||
@@ -59,7 +59,7 @@ CTMDB::CTMDB()
|
||||
|
||||
CTMDB::~CTMDB()
|
||||
{
|
||||
cleanup();
|
||||
cleanup();
|
||||
}
|
||||
|
||||
void CTMDB::setTitle(std::string epgtitle)
|
||||
@@ -74,7 +74,8 @@ void CTMDB::setTitle(std::string epgtitle)
|
||||
if ((minfo.result < 1 || minfo.overview.empty()) && lang != "en")
|
||||
getMovieDetails("en", true);
|
||||
|
||||
if(hintbox){
|
||||
if (hintbox)
|
||||
{
|
||||
hintbox->hide();
|
||||
delete hintbox;
|
||||
hintbox = NULL;
|
||||
@@ -89,7 +90,8 @@ bool CTMDB::getData(std::string url, Json::Value *root)
|
||||
|
||||
std::string errMsg = "";
|
||||
bool ok = parseJsonFromString(answer, root, &errMsg);
|
||||
if (!ok) {
|
||||
if (!ok)
|
||||
{
|
||||
printf("Failed to parse JSON\n");
|
||||
printf("%s\n", errMsg.c_str());
|
||||
return false;
|
||||
@@ -99,75 +101,84 @@ bool CTMDB::getData(std::string url, Json::Value *root)
|
||||
|
||||
bool CTMDB::getMovieDetails(std::string lang, bool second)
|
||||
{
|
||||
printf("[TMDB]: %s\n",__func__);
|
||||
printf("[TMDB]: %s\n", __func__);
|
||||
Json::Value root;
|
||||
const std::string urlapi = "http://api.themoviedb.org/3/";
|
||||
std::string url = urlapi + "search/multi?api_key="+key+"&language="+lang+"&query=" + encodeUrl(minfo.epgtitle);
|
||||
if(!(getData(url, &root)))
|
||||
std::string url = urlapi + "search/multi?api_key=" + key + "&language=" + lang + "&query=" + encodeUrl(minfo.epgtitle);
|
||||
if (!(getData(url, &root)))
|
||||
return false;
|
||||
|
||||
minfo.result = root.get("total_results",0).asInt();
|
||||
if(minfo.result == 0){
|
||||
minfo.result = root.get("total_results", 0).asInt();
|
||||
if (minfo.result == 0)
|
||||
{
|
||||
std::string title = minfo.epgtitle;
|
||||
size_t pos1 = title.find_last_of("(");
|
||||
size_t pos2 = title.find_last_of(")");
|
||||
if(pos1 != std::string::npos && pos2 != std::string::npos && pos2 > pos1){
|
||||
if (pos1 != std::string::npos && pos2 != std::string::npos && pos2 > pos1)
|
||||
{
|
||||
printf("[TMDB]: second try\n");
|
||||
title.replace(pos1, pos2-pos1+1, "");
|
||||
url = urlapi + "search/multi?api_key="+key+"&language="+lang+"&query=" + encodeUrl(title);
|
||||
if(!(getData(url, &root)))
|
||||
title.replace(pos1, pos2 - pos1 + 1, "");
|
||||
url = urlapi + "search/multi?api_key=" + key + "&language=" + lang + "&query=" + encodeUrl(title);
|
||||
if (!(getData(url, &root)))
|
||||
return false;
|
||||
|
||||
minfo.result = root.get("total_results",0).asInt();
|
||||
minfo.result = root.get("total_results", 0).asInt();
|
||||
}
|
||||
}
|
||||
printf("[TMDB]: results: %d\n",minfo.result);
|
||||
printf("[TMDB]: results: %d\n", minfo.result);
|
||||
|
||||
if (minfo.result > 0) {
|
||||
if (minfo.result > 0)
|
||||
{
|
||||
Json::Value elements = root["results"];
|
||||
int use_result = 0;
|
||||
|
||||
if ((minfo.result > 1) && (!second))
|
||||
selectResult(elements, minfo.result, use_result);
|
||||
|
||||
if (!second) {
|
||||
minfo.id = elements[use_result].get("id",-1).asInt();
|
||||
minfo.media_type = elements[use_result].get("media_type","").asString();
|
||||
if (!second)
|
||||
{
|
||||
minfo.id = elements[use_result].get("id", -1).asInt();
|
||||
minfo.media_type = elements[use_result].get("media_type", "").asString();
|
||||
}
|
||||
if (minfo.id > -1) {
|
||||
url = urlapi+minfo.media_type+"/"+to_string(minfo.id)+"?api_key="+key+"&language="+lang+"&append_to_response=credits";
|
||||
if(!(getData(url, &root)))
|
||||
if (minfo.id > -1)
|
||||
{
|
||||
url = urlapi + minfo.media_type + "/" + to_string(minfo.id) + "?api_key=" + key + "&language=" + lang + "&append_to_response=credits";
|
||||
if (!(getData(url, &root)))
|
||||
return false;
|
||||
|
||||
minfo.overview = root.get("overview","").asString();
|
||||
minfo.poster_path = root.get("poster_path","").asString();
|
||||
minfo.original_title = root.get("original_title","").asString();;
|
||||
minfo.release_date = root.get("release_date","").asString();;
|
||||
minfo.vote_average = root.get("vote_average","").asString();;
|
||||
minfo.vote_count = root.get("vote_count",0).asInt();;
|
||||
minfo.runtime = root.get("runtime",0).asInt();;
|
||||
if (minfo.media_type == "tv") {
|
||||
minfo.original_title = root.get("original_name","").asString();;
|
||||
minfo.episodes = root.get("number_of_episodes",0).asInt();;
|
||||
minfo.seasons = root.get("number_of_seasons",0).asInt();;
|
||||
minfo.release_date = root.get("first_air_date","").asString();;
|
||||
minfo.overview = root.get("overview", "").asString();
|
||||
minfo.poster_path = root.get("poster_path", "").asString();
|
||||
minfo.original_title = root.get("original_title", "").asString();;
|
||||
minfo.release_date = root.get("release_date", "").asString();;
|
||||
minfo.vote_average = root.get("vote_average", "").asString();;
|
||||
minfo.vote_count = root.get("vote_count", 0).asInt();;
|
||||
minfo.runtime = root.get("runtime", 0).asInt();;
|
||||
if (minfo.media_type == "tv")
|
||||
{
|
||||
minfo.original_title = root.get("original_name", "").asString();;
|
||||
minfo.episodes = root.get("number_of_episodes", 0).asInt();;
|
||||
minfo.seasons = root.get("number_of_seasons", 0).asInt();;
|
||||
minfo.release_date = root.get("first_air_date", "").asString();;
|
||||
elements = root["episode_run_time"];
|
||||
minfo.runtimes = elements[0].asString();
|
||||
for (unsigned int i= 1; i<elements.size();i++) {
|
||||
minfo.runtimes += + ", "+elements[i].asString();
|
||||
for (unsigned int i = 1; i < elements.size(); i++)
|
||||
{
|
||||
minfo.runtimes += + ", " + elements[i].asString();
|
||||
}
|
||||
}
|
||||
|
||||
elements = root["genres"];
|
||||
minfo.genres = elements[0].get("name","").asString();
|
||||
for (unsigned int i= 1; i<elements.size();i++) {
|
||||
minfo.genres += ", " + elements[i].get("name","").asString();
|
||||
minfo.genres = elements[0].get("name", "").asString();
|
||||
for (unsigned int i = 1; i < elements.size(); i++)
|
||||
{
|
||||
minfo.genres += ", " + elements[i].get("name", "").asString();
|
||||
}
|
||||
|
||||
elements = root["credits"]["cast"];
|
||||
minfo.cast.clear();
|
||||
for (unsigned int i= 0; i<elements.size() && i<10;i++) {
|
||||
minfo.cast += " "+elements[i].get("character","").asString()+" ("+elements[i].get("name","").asString() + ")\n";
|
||||
for (unsigned int i = 0; i < elements.size() && i < 10; i++)
|
||||
{
|
||||
minfo.cast += " " + elements[i].get("character", "").asString() + " (" + elements[i].get("name", "").asString() + ")\n";
|
||||
//printf("test: %s (%s)\n",elements[i].get("character","").asString().c_str(),elements[i].get("name","").asString().c_str());
|
||||
}
|
||||
|
||||
@@ -178,7 +189,8 @@ bool CTMDB::getMovieDetails(std::string lang, bool second)
|
||||
|
||||
return true;
|
||||
}
|
||||
} else
|
||||
}
|
||||
else
|
||||
return false;
|
||||
|
||||
return false;
|
||||
@@ -188,7 +200,7 @@ std::string CTMDB::getEPGText()
|
||||
{
|
||||
std::string epgtext("");
|
||||
|
||||
epgtext += "Vote: " + minfo.vote_average.substr(0,3) + "/10 Votecount: " + to_string(minfo.vote_count) + "\n";
|
||||
epgtext += "Vote: " + minfo.vote_average.substr(0, 3) + "/10 Votecount: " + to_string(minfo.vote_count) + "\n";
|
||||
epgtext += "\n";
|
||||
epgtext += minfo.overview + "\n";
|
||||
epgtext += "\n";
|
||||
@@ -198,7 +210,7 @@ std::string CTMDB::getEPGText()
|
||||
epgtext += g_Locale->getString(LOCALE_EPGVIEWER_LENGTH) + ": " + to_string(minfo.runtime) + "\n";
|
||||
epgtext += g_Locale->getString(LOCALE_EPGVIEWER_GENRE) + ": " + minfo.genres + "\n";
|
||||
epgtext += g_Locale->getString(LOCALE_EPGEXTENDED_ORIGINAL_TITLE) + ": " + minfo.original_title + "\n";
|
||||
epgtext += g_Locale->getString(LOCALE_EPGEXTENDED_YEAR_OF_PRODUCTION) + ": " + minfo.release_date.substr(0,4) + "\n";
|
||||
epgtext += g_Locale->getString(LOCALE_EPGEXTENDED_YEAR_OF_PRODUCTION) + ": " + minfo.release_date.substr(0, 4) + "\n";
|
||||
if (minfo.media_type == "tv")
|
||||
epgtext += "Seasons/Episodes: " + to_string(minfo.seasons) + "/" + to_string(minfo.episodes) + "\n";
|
||||
if (!minfo.cast.empty())
|
||||
@@ -233,7 +245,8 @@ void CTMDB::cleanup()
|
||||
|
||||
void CTMDB::selectResult(Json::Value elements, int results, int &use_result)
|
||||
{
|
||||
if(hintbox){
|
||||
if (hintbox)
|
||||
{
|
||||
hintbox->hide();
|
||||
delete hintbox;
|
||||
hintbox = NULL;
|
||||
@@ -242,18 +255,18 @@ void CTMDB::selectResult(Json::Value elements, int results, int &use_result)
|
||||
int select = 0;
|
||||
|
||||
CMenuWidget *m = new CMenuWidget(LOCALE_TMDB_READ_DATA, NEUTRINO_ICON_SETTINGS);
|
||||
CMenuSelectorTarget * selector = new CMenuSelectorTarget(&select);
|
||||
CMenuSelectorTarget *selector = new CMenuSelectorTarget(&select);
|
||||
|
||||
// we don't show introitems, so we add a separator for a smoother view
|
||||
m->addItem(GenericMenuSeparator);
|
||||
CMenuForwarder* mf;
|
||||
CMenuForwarder *mf;
|
||||
int counter = std::min(results, 10);
|
||||
for (int i = 0; i != counter; i++)
|
||||
{
|
||||
if (elements[i].get("media_type","").asString() == "movie")
|
||||
mf = new CMenuForwarder(elements[i].get("title","").asString(), true, NULL, selector, to_string(i).c_str());
|
||||
if (elements[i].get("media_type", "").asString() == "movie")
|
||||
mf = new CMenuForwarder(elements[i].get("title", "").asString(), true, NULL, selector, to_string(i).c_str());
|
||||
else
|
||||
mf = new CMenuForwarder(elements[i].get("name","").asString(), true, NULL, selector, to_string(i).c_str());
|
||||
mf = new CMenuForwarder(elements[i].get("name", "").asString(), true, NULL, selector, to_string(i).c_str());
|
||||
m->addItem(mf);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user