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

yhook: rename outCollection() => outObject() to be more json

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 69615480f1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-23 (Tue, 23 Feb 2016)

Origin message was:
------------------
- yhook: rename outCollection() => outObject() to be more json

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-02-23 14:56:52 +01:00
parent 473cc6afec
commit ffcf0fc8a3
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/nhttpd/tuxboxapi/controlapi.cpp
View File

@@ -413,7 +413,7 @@ void CControlAPI::GetModeCGI(CyhookHandler *hh)
if (hh->getOutType() != plain) if (hh->getOutType() != plain)
{ {
result = hh->outPair("mode", result, false); result = hh->outPair("mode", result, false);
result = hh->outCollection("getmode", result); result = hh->outObject("getmode", result);
} }
hh->SendResult(result); hh->SendResult(result);
} }
@@ -938,13 +938,13 @@ void CControlAPI::LogolistCGI(CyhookHandler *hh)
id = hh->outPair("short", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->getChannelID() & 0xFFFFFFFFFFFFULL), true); id = hh->outPair("short", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->getChannelID() & 0xFFFFFFFFFFFFULL), true);
id += hh->outPair("long", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->getChannelID()), false); id += hh->outPair("long", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->getChannelID()), false);
item += hh->outCollection("id", id, files); item += hh->outObject("id", id, files);
if (files) if (files)
{ {
logo = hh->outPair("used", logo_used, true); logo = hh->outPair("used", logo_used, true);
logo += hh->outPair("real", logo_real, false); logo += hh->outPair("real", logo_real, false);
item += hh->outCollection("logo", logo); item += hh->outObject("logo", logo);
} }
} }
if (isFirstLine) if (isFirstLine)
@@ -1007,11 +1007,11 @@ std::string CControlAPI::_GetBouquetActualEPGItem(CyhookHandler *hh, CZapitChann
result += hh->outPair("isActiveChannel", (channel->getChannelID() == current_channel) ? "true" : "false", (!firstEPG.empty())); result += hh->outPair("isActiveChannel", (channel->getChannelID() == current_channel) ? "true" : "false", (!firstEPG.empty()));
if(!firstEPG.empty()) { if(!firstEPG.empty()) {
result += hh->outCollection("firstEPG", firstEPG); result += hh->outObject("firstEPG", firstEPG);
} }
if(!secondEPG.empty()) { if(!secondEPG.empty()) {
result += hh->outNext(); result += hh->outNext();
result += hh->outCollection("secondEPG", secondEPG); result += hh->outObject("secondEPG", secondEPG);
} }
return result; return result;
} }
@@ -1329,7 +1329,7 @@ std::string CControlAPI::channelEPGformated(CyhookHandler *hh, int bouquetnr, t_
channelData += hh->outPair("channel_short_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel_id & 0xFFFFFFFFFFFFULL), true); channelData += hh->outPair("channel_short_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel_id & 0xFFFFFFFFFFFFULL), true);
channelData += hh->outPair("channel_name", hh->outValue(NeutrinoAPI->GetServiceName(channel_id)), false); channelData += hh->outPair("channel_name", hh->outValue(NeutrinoAPI->GetServiceName(channel_id)), false);
if(hh->outType == json) if(hh->outType == json)
channelData = hh->outCollection("channelData", channelData); channelData = hh->outObject("channelData", channelData);
int i = 0; int i = 0;
CChannelEventList::iterator eventIterator; CChannelEventList::iterator eventIterator;
bool isFirstLine = true; bool isFirstLine = true;
@@ -1451,7 +1451,7 @@ void CControlAPI::epgDetailList(CyhookHandler *hh) {
// list one channel, no bouquetnr given // list one channel, no bouquetnr given
result = channelEPGformated(hh, 0, channel_id, max, stoptime); result = channelEPGformated(hh, 0, channel_id, max, stoptime);
result = hh->outCollection("epglist", result); result = hh->outObject("epglist", result);
hh->SendResult(result); hh->SendResult(result);
} }
@@ -3035,7 +3035,7 @@ void CControlAPI::ConfigCGI(CyhookHandler *hh) {
error = string_printf("no config defined for %s", (hh->ParamList["config"]).c_str()); error = string_printf("no config defined for %s", (hh->ParamList["config"]).c_str());
} }
hh->WriteLn(hh->outCollection("config", result)); hh->WriteLn(hh->outObject("config", result));
if (error.empty()) if (error.empty())
hh->SendResult(result); hh->SendResult(result);
@@ -3260,7 +3260,7 @@ void CControlAPI::StatfsCGI(CyhookHandler *hh) {
item += hh->outPair("f_namelen", string_printf("%lu", (unsigned long) s.f_namelen), true); item += hh->outPair("f_namelen", string_printf("%lu", (unsigned long) s.f_namelen), true);
item += hh->outPair("f_frsize", string_printf("%lu", (unsigned long) s.f_frsize), false); item += hh->outPair("f_frsize", string_printf("%lu", (unsigned long) s.f_frsize), false);
result = hh->outCollection("statfs", item); result = hh->outObject("statfs", item);
hh->SendResult(result); hh->SendResult(result);
} }

2
src/nhttpd/yhttpd_core/yhook.cpp
View File

@@ -495,7 +495,7 @@ std::string CyhookHandler::outArrayItem(std::string _key, std::string _content,
return result; return result;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
std::string CyhookHandler::outCollection(std::string _key, std::string _content, bool _next) { std::string CyhookHandler::outObject(std::string _key, std::string _content, bool _next) {
std::string result = ""; std::string result = "";
switch (outType) { switch (outType) {
case xml: case xml:

2
src/nhttpd/yhttpd_core/yhook.h
View File

@@ -208,7 +208,7 @@ public:
std::string outPair(std::string _key, std::string _content, bool _next); std::string outPair(std::string _key, std::string _content, bool _next);
std::string outArray(std::string _key, std::string _content); std::string outArray(std::string _key, std::string _content);
std::string outArrayItem(std::string _key, std::string _content, bool _next); std::string outArrayItem(std::string _key, std::string _content, bool _next);
std::string outCollection(std::string _key,std::string _content, bool _next = false); std::string outObject(std::string _key,std::string _content, bool _next = false);
std::string outValue(std::string _content); std::string outValue(std::string _content);
std::string outNext(); std::string outNext();
friend class CyParser; friend class CyParser;