Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-28 06:32:32 +02:00
Code Issues Projects Releases Wiki Activity

2018-07-19 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in rdadmin(1) that caused the credentials fields to
	be greyed out when configuring a podcast feed to use SFTP uploads.
	* Fixed a bug in 'RDExport' that caused encoding of credentials
	to be corrupt.
	* Fixed a regression in the RDFeed service that caused detection
	of feed	names to fail.
This commit is contained in:
Fred Gleason 2018-07-19 20:11:02 +00:00
parent 25e0868a42
commit 94ff45a4dc
5 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -17187,3 +17187,10 @@
2018-07-19 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'RDEncoder' class.
* Removed the 'RDEncoderList' class.
2018-07-19 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdadmin(1) that caused the credentials fields to
be greyed out when configuring a podcast feed to use SFTP uploads.
* Fixed a bug in 'RDExport' that caused encoding of credentials
to be corrupt.
* Fixed a regression in the RDFeed service that caused detection
of feed names to fail.

4
lib/rdaudioexport.cpp
View File

@ -142,8 +142,8 @@ RDAudioExport::ErrorCode RDAudioExport::runExport(const QString &username,
//
QString post=QString().sprintf("COMMAND=%d&",RDXPORT_COMMAND_EXPORT)+
"LOGIN_NAME=RDFormPost::urlEncode(username)&"+
"PASSWORD=RDFormPost::urlEncode(password)&"+
"LOGIN_NAME="+RDFormPost::urlEncode(username)+"&"+
"PASSWORD="+RDFormPost::urlEncode(password)+"&"+
QString().sprintf("CART_NUMBER=%u&",conv_cart_number)+
QString().sprintf("CUT_NUMBER=%u&",conv_cut_number)+
QString().sprintf("FORMAT=%d&",conv_settings->format())+

4
lib/rdfeed.cpp
View File

@ -537,6 +537,7 @@ unsigned RDFeed::postCut(RDUser *user,RDStation *station,
RDUpload *upload=NULL;
RDUpload::ErrorCode upload_err;
RDAudioConvert::ErrorCode audio_conv_err;
RDAudioExport::ErrorCode export_err;
emit postProgressChanged(0);
emit postProgressChanged(1);
@ -563,7 +564,7 @@ unsigned RDFeed::postCut(RDUser *user,RDStation *station,
settings->setBitRate(uploadBitRate());
settings->setNormalizationLevel(normalizeLevel()/100);
conv->setDestinationSettings(settings);
switch(conv->runExport(user->name(),user->password(),&audio_conv_err)) {
switch((export_err=conv->runExport(user->name(),user->password(),&audio_conv_err))) {
case RDAudioExport::ErrorOk:
break;
@ -728,7 +729,6 @@ unsigned RDFeed::postFile(RDStation *station,const QString &srcfile,Error *err,
default:
emit postProgressChanged(totalPostSteps());
*err=RDFeed::ErrorUploadFailed;
printf("Upload Error: %s\n",(const char *)RDUpload::errorText(upload_err));
sql=QString().sprintf("delete from PODCASTS where ID=%u",cast_id);
q=new RDSqlQuery(sql);
delete q;

2
rdadmin/edit_feed.cpp
View File

@ -508,7 +508,7 @@ void EditFeed::purgeUrlChangedData(const QString &str)
{
QUrl url(str);
QString protocol=url.protocol();
if(((protocol=="ftp")||(protocol=="smb"))&&
if(((protocol=="ftp")||(protocol=="sftp"))&&
(!feed_redirect_check->isChecked())) {
feed_purge_username_label->setEnabled(true);
feed_purge_username_edit->setEnabled(true);

19
web/rdfeed/rdfeed_script.cpp
View File

@ -113,20 +113,6 @@ MainObject::MainObject(QObject *parent)
exit(0);
}
//
// Read Command Options
//
for(unsigned i=0;i<rda->cmdSwitch()->keys();i++) {
if(!rda->cmdSwitch()->processed(i)) {
printf("Content-type: text/html\n");
printf("Status: 500\n");
printf("\n");
printf("rdfeed.xml: unknown command option \"%s\"\n",
(const char *)rda->cmdSwitch()->key(i));
exit(0);
}
}
if(cast_id<0) {
ServeRss(keyname,count);
}
@ -219,7 +205,8 @@ void MainObject::ServeRss(const char *keyname,bool count)
"ID "+ // 12
"from PODCASTS where "+
QString().sprintf("(FEED_ID=%d)&&",q->value(13).toUInt())+
QString().sprintf("(STATUS=%d)",RDPodcast::StatusActive);
QString().sprintf("(STATUS=%d) ",RDPodcast::StatusActive)+
"order by ORIGIN_DATETIME";
if(q->value(15).toString()=="N") {
sql+=" desc";
}
@ -231,7 +218,7 @@ void MainObject::ServeRss(const char *keyname,bool count)
getenv("QUERY_STRING"),
q->value(13).toUInt(),
q1->value(7).toUInt()));
// printf("%s\n",(const char *)ResolveItemWildcards(q1,q));
//printf("%s\n",(const char *)ResolveItemWildcards(q1,q));
printf("</item>\n");
}
delete q1;