VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Web API: return 404 with API HTML documentation if URL is incorrect. Avoids response OK mistaken when not using a browser

This commit is contained in:
f4exb 2017-12-12 15:58:04 +01:00
parent e4b65b52b4
commit c22460723c
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/channelrx/demodnfm/nfmdemod.cpp
View File

@ -318,8 +318,6 @@ void NFMDemod::stop()
bool NFMDemod::handleMessage(const Message& cmd)
{
qDebug() << "NFMDemod::handleMessage";
if (DownChannelizer::MsgChannelizerNotification::match(cmd))
{
DownChannelizer::MsgChannelizerNotification& notif = (DownChannelizer::MsgChannelizerNotification&) cmd;
@ -331,7 +329,8 @@ bool NFMDemod::handleMessage(const Message& cmd)
applySettings(settings);
qDebug() << "NFMDemod::handleMessage: MsgChannelizerNotification: m_inputSampleRate: " << settings.m_inputSampleRate
qDebug() << "NFMDemod::handleMessage: DownChannelizer::MsgChannelizerNotification:"
<< " m_inputSampleRate: " << settings.m_inputSampleRate
<< " m_inputFrequencyOffset: " << settings.m_inputFrequencyOffset;
return true;
@ -344,6 +343,10 @@ bool NFMDemod::handleMessage(const Message& cmd)
cfg.getSampleRate(),
cfg.getCenterFrequency());
qDebug() << "NFMDemod::handleMessage: MsgConfigureChannelizer:"
<< " sampleRate: " << cfg.getSampleRate()
<< " centerFrequency: " << cfg.getCenterFrequency();
return true;
}
else if (MsgConfigureNFMDemod::match(cmd))

2
plugins/channelrx/demodnfm/nfmdemodgui.cpp
View File

@ -76,6 +76,7 @@ bool NFMDemodGUI::handleMessage(const Message& message)
{
if (NFMDemod::MsgReportCTCSSFreq::match(message))
{
qDebug("NFMDemodGUI::handleMessage: NFMDemod::MsgReportCTCSSFreq");
NFMDemod::MsgReportCTCSSFreq& report = (NFMDemod::MsgReportCTCSSFreq&) message;
setCtcssFreq(report.getFrequency());
//qDebug("NFMDemodGUI::handleMessage: MsgReportCTCSSFreq: %f", report.getFrequency());
@ -83,6 +84,7 @@ bool NFMDemodGUI::handleMessage(const Message& message)
}
else if (NFMDemod::MsgConfigureNFMDemod::match(message))
{
qDebug("NFMDemodGUI::handleMessage: NFMDemod::MsgConfigureNFMDemod");
const NFMDemod::MsgConfigureNFMDemod& cfg = (NFMDemod::MsgConfigureNFMDemod&) message;
m_settings = cfg.getSettings();
blockApplySettings(true);

8
plugins/channeltx/modnfm/nfmmod.cpp
View File

@ -289,7 +289,7 @@ bool NFMMod::handleMessage(const Message& cmd)
applySettings(settings);
qDebug() << "NFMMod::handleMessage: MsgChannelizerNotification:"
qDebug() << "NFMMod::handleMessage: UpChannelizer::MsgChannelizerNotification:"
<< " m_basebandSampleRate: " << settings.m_basebandSampleRate
<< " m_outputSampleRate: " << settings.m_outputSampleRate
<< " m_inputFrequencyOffset: " << settings.m_inputFrequencyOffset;
@ -341,6 +341,8 @@ bool NFMMod::handleMessage(const Message& cmd)
MsgConfigureFileSourceName& conf = (MsgConfigureFileSourceName&) cmd;
m_fileName = conf.getFileName();
openFileStream();
qDebug() << "NFMMod::handleMessage: MsgConfigureFileSourceName:"
<< " m_fileName: " << m_fileName;
return true;
}
else if (MsgConfigureFileSourceSeek::match(cmd))
@ -348,6 +350,8 @@ bool NFMMod::handleMessage(const Message& cmd)
MsgConfigureFileSourceSeek& conf = (MsgConfigureFileSourceSeek&) cmd;
int seekPercentage = conf.getPercentage();
seekFileStream(seekPercentage);
qDebug() << "NFMMod::handleMessage: MsgConfigureFileSourceSeek:"
<< " seekPercentage: " << seekPercentage;
return true;
}
@ -355,6 +359,8 @@ bool NFMMod::handleMessage(const Message& cmd)
{
MsgConfigureAFInput& conf = (MsgConfigureAFInput&) cmd;
m_afInput = conf.getAFInput();
qDebug() << "NFMMod::handleMessage: MsgConfigureAFInput:"
<< " seekPercentage: " << m_afInput;
return true;
}

5
sdrbase/webapi/webapirequestmapper.cpp
View File

@ -106,6 +106,7 @@ void WebAPIRequestMapper::service(qtwebapp::HttpRequest& request, qtwebapp::Http
else
{
QByteArray path = "/index.html";
response.setStatus(404, "Page not found");
m_staticFileController->service(path, response);
}
@ -1092,7 +1093,7 @@ bool WebAPIRequestMapper::validateChannelSettings(SWGSDRangel::SWGChannelSetting
{
if (channelSettings.getTx() == 0)
{
QJsonObject nfmDemodSettingsJsonObject = jsonObject["nfmDemodSettings"].toObject();
QJsonObject nfmDemodSettingsJsonObject = jsonObject["NFMDemodSettings"].toObject();
channelSettings.setNfmDemodSettings(new SWGSDRangel::SWGNFMDemodSettings());
channelSettings.getNfmDemodSettings()->fromJsonObject(nfmDemodSettingsJsonObject);
return true;
@ -1105,7 +1106,7 @@ bool WebAPIRequestMapper::validateChannelSettings(SWGSDRangel::SWGChannelSetting
{
if (channelSettings.getTx() != 0)
{
QJsonObject nfmModSettingsJsonObject = jsonObject["nfmModSettings"].toObject();
QJsonObject nfmModSettingsJsonObject = jsonObject["NFMModSettings"].toObject();
channelSettings.setNfmModSettings(new SWGSDRangel::SWGNFMModSettings());
channelSettings.getNfmModSettings()->fromJsonObject(nfmModSettingsJsonObject);
return true;