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

Add support for FTPS upload and download in RDCatch.

Browse Source 
cURL supports 'ftps://' URLs so this change was trivial.
This commit is contained in:
David Klann 2020-08-15 21:11:41 -05:00
parent afb3832f72
commit 7d60274573
No known key found for this signature in database
GPG Key ID: 66DC59FBEDF670D8
6 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -20244,3 +20244,6 @@
'Podcast Feed Item List' dialog in rdcastmanager(1).
2020-08-13 Fred Gleason <fredg@paravelsystems.com>
* Added an 'RDCastManager' chapter to the Operations Guide.
2020-08-15 David Klann <dklann@linux.com>
* Added support for FTPS protocol for uploading, downloading, and
Feed management.

3
lib/rddelete.cpp
View File

@ -81,6 +81,7 @@ QStringList RDDelete::supportedSchemes() const
schemes.push_back("file");
schemes.push_back("ftp");
schemes.push_back("sftp");
schemes.push_back("ftps");
return schemes;
}
@ -131,7 +132,7 @@ RDDelete::ErrorCode RDDelete::runDelete(const QString &username,
curl_easy_setopt(curl,CURLOPT_DEBUGFUNCTION,DeleteErrorCallback);
}
if(conv_target_url.scheme().toLower()=="ftp") {
if(conv_target_url.scheme().toLower()=="ftp"||conv_target_url.scheme().toLower()=="ftps") {
QStringList f0=conv_target_url.path().split("/",QString::SkipEmptyParts);
filename=f0.last();
f0.removeLast();

1
lib/rddownload.cpp
View File

@ -82,6 +82,7 @@ QStringList RDDownload::supportedSchemes() const
schemes.push_back("file");
schemes.push_back("ftp");
schemes.push_back("ftps");
schemes.push_back("http");
schemes.push_back("https");
schemes.push_back("sftp");

1
lib/rdupload.cpp
View File

@ -85,6 +85,7 @@ QStringList RDUpload::supportedSchemes() const
schemes.push_back("file");
schemes.push_back("ftp");
schemes.push_back("sftp");
schemes.push_back("ftps");
return schemes;
}

4
rdcatch/edit_download.cpp
View File

@ -433,7 +433,7 @@ void EditDownload::urlChangedData(const QString &str)
{
QUrl url(str);
QString protocol=url.protocol();
if((protocol=="ftp")||(protocol=="http")||(protocol=="file")||
if((protocol=="ftp")||(protocol=="ftps")||(protocol=="http")||(protocol=="file")||
(protocol=="scp")||(protocol=="sftp")) {
edit_username_label->setEnabled(true);
edit_username_edit->setEnabled(true);
@ -502,7 +502,7 @@ void EditDownload::okData()
}
QUrl url(edit_url_edit->text());
QString protocol=url.protocol();
if((protocol!="ftp")&&(protocol!="http")&&(protocol!="https")&&
if((protocol!="ftp")&&(protocol!="ftps")&&(protocol!="http")&&(protocol!="https")&&
(protocol!="file")&&(protocol!="scp")&&(protocol!="sftp")) {
QMessageBox::warning(this,
tr("Invalid URL"),tr("Unsupported URL protocol!"));

4
rdcatch/edit_upload.cpp
View File

@ -449,7 +449,7 @@ void EditUpload::urlChangedData(const QString &str)
{
QUrl url(str);
QString protocol=url.protocol().lower();
if((protocol=="ftp")||(protocol=="file")||
if((protocol=="ftp")||(protocol=="ftps")||(protocol=="file")||
(protocol=="scp")||(protocol=="sftp")) {
edit_username_label->setEnabled(true);
edit_username_edit->setEnabled(true);
@ -527,7 +527,7 @@ void EditUpload::okData()
}
QUrl url(edit_url_edit->text());
QString protocol=url.protocol();
if((protocol!="ftp")&&(protocol!="file")&&
if((protocol!="ftp")&&(protocol!="ftps")&&(protocol!="file")&&
(protocol!="scp")&&(protocol!="sftp")) {
QMessageBox::warning(this,
tr("Invalid URL"),tr("Unsupported URL protocol!"));