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

Fixed conflict in 'ChangeLog'

Browse Source 
Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2022-12-19 12:44:21 -05:00
commit e509a821d7
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -23828,3 +23828,8 @@
2022-12-16 Fred Gleason <fredg@paravelsystems.com> 2022-12-16 Fred Gleason <fredg@paravelsystems.com>
* Added 'qt5-linguist' to the list of required build packages for * Added 'qt5-linguist' to the list of required build packages for
RHEL-7 in 'INSTALL'. RHEL-7 in 'INSTALL'.
2022-12-19 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdcastmanager(1) that could cause items from
non-selected feeds to appear in the 'Podcast Item List' dialog.
* Fixed a regression in rdcastmanager(1) that could cause a segfault
when posting a new item.

17
lib/rdfeed.cpp
View File

@ -60,7 +60,7 @@ int __RDFeed_Debug_Callback(CURL *handle,curl_infotype type,char *data,
size_t __RDFeed_Write_Callback(char *ptr,size_t size,size_t nmemb, size_t __RDFeed_Write_Callback(char *ptr,size_t size,size_t nmemb,
void *userdata) void *userdata)
{ {
static QByteArray *buffer=(QByteArray *)userdata; QByteArray *buffer=(QByteArray *)userdata;
buffer->append(QByteArray(ptr,size*nmemb)); buffer->append(QByteArray(ptr,size*nmemb));
@ -867,9 +867,9 @@ bool RDFeed::postPodcast(unsigned cast_id,QString *err_msg)
return false; return false;
} }
QStringList *err_msgs=SetupCurlLogging(curl); QStringList *err_msgs=SetupCurlLogging(curl);
QByteArray write_buffer;
curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,__RDFeed_Write_Callback); curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,__RDFeed_Write_Callback);
feed_curl_write_buffer.clear(); curl_easy_setopt(curl,CURLOPT_WRITEDATA,&write_buffer);
curl_easy_setopt(curl,CURLOPT_WRITEDATA,&feed_curl_write_buffer);
curl_easy_setopt(curl,CURLOPT_HTTPPOST,first); curl_easy_setopt(curl,CURLOPT_HTTPPOST,first);
curl_easy_setopt(curl,CURLOPT_USERAGENT, curl_easy_setopt(curl,CURLOPT_USERAGENT,
rda->config()->userAgent().toUtf8().constData()); rda->config()->userAgent().toUtf8().constData());
@ -906,7 +906,7 @@ bool RDFeed::postPodcast(unsigned cast_id,QString *err_msg)
if((response_code<200)||(response_code>299)) { if((response_code<200)||(response_code>299)) {
ProcessCurlLogging("RDFeed::postPodcast()",err_msgs); ProcessCurlLogging("RDFeed::postPodcast()",err_msgs);
RDWebResult *wr=new RDWebResult(); RDWebResult *wr=new RDWebResult();
if(wr->readXml(QString::fromUtf8(feed_curl_write_buffer))) { if(wr->readXml(QString::fromUtf8(write_buffer))) {
*err_msg=wr->text(); *err_msg=wr->text();
} }
else { else {
@ -1353,7 +1353,6 @@ unsigned RDFeed::postCut(const QString &cutname,QString *err_msg)
} }
delete settings; delete settings;
delete conv; delete conv;
postProgressChanged(2);
// //
// Save to Audio Store // Save to Audio Store
@ -1379,7 +1378,6 @@ unsigned RDFeed::postCut(const QString &cutname,QString *err_msg)
emit postProgressChanged(5); emit postProgressChanged(5);
return 0; return 0;
} }
postProgressChanged(3);
// //
// Set default cast parameters // Set default cast parameters
@ -1492,7 +1490,6 @@ unsigned RDFeed::postFile(const QString &srcfile,QString *err_msg)
emit postProgressChanged(6); emit postProgressChanged(6);
return 0; return 0;
} }
postProgressChanged(4);
// //
// Set default cast parameters // Set default cast parameters
@ -1921,9 +1918,9 @@ bool RDFeed::SavePodcast(unsigned cast_id,const QString &src_filename,
return false; return false;
} }
QStringList *err_msgs=SetupCurlLogging(curl); QStringList *err_msgs=SetupCurlLogging(curl);
feed_curl_write_buffer.clear(); QByteArray write_buffer;
curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,__RDFeed_Write_Callback); curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,__RDFeed_Write_Callback);
curl_easy_setopt(curl,CURLOPT_WRITEDATA,&feed_curl_write_buffer); curl_easy_setopt(curl,CURLOPT_WRITEDATA,&write_buffer);
curl_easy_setopt(curl,CURLOPT_HTTPPOST,first); curl_easy_setopt(curl,CURLOPT_HTTPPOST,first);
curl_easy_setopt(curl,CURLOPT_USERAGENT, curl_easy_setopt(curl,CURLOPT_USERAGENT,
rda->config()->userAgent().toUtf8().constData()); rda->config()->userAgent().toUtf8().constData());
@ -1957,7 +1954,7 @@ bool RDFeed::SavePodcast(unsigned cast_id,const QString &src_filename,
// //
if((response_code<200)||(response_code>299)) { if((response_code<200)||(response_code>299)) {
ProcessCurlLogging("RDFeed::postPodcast()",err_msgs); ProcessCurlLogging("RDFeed::postPodcast()",err_msgs);
*err_msg=QString::fromUtf8(feed_curl_write_buffer); *err_msg=QString::fromUtf8(write_buffer);
return false; return false;
} }
delete err_msgs; delete err_msgs;

1
lib/rdfeed.h
View File

@ -187,7 +187,6 @@ class RDFeed : public QObject
int feed_xml_ptr; int feed_xml_ptr;
int feed_render_start_line; int feed_render_start_line;
int feed_render_end_line; int feed_render_end_line;
QByteArray feed_curl_write_buffer;
}; };

10
lib/rdpodcastlistmodel.cpp
View File

@ -292,11 +292,14 @@ void RDPodcastListModel::processNotification(RDNotification *notify)
RDPodcast *cast=NULL; RDPodcast *cast=NULL;
if(notify->type()==RDNotification::FeedItemType) { if(notify->type()==RDNotification::FeedItemType) {
cast_id=notify->id().toUInt();
cast=new RDPodcast(rda->config(),cast_id);
switch(notify->action()) { switch(notify->action()) {
case RDNotification::AddAction: case RDNotification::AddAction:
addCast(cast_id); cast_id=notify->id().toUInt();
cast=new RDPodcast(rda->config(),cast_id);
if(cast->feedId()==d_feed_id) {
addCast(cast_id);
}
delete cast;
break; break;
case RDNotification::DeleteAction: case RDNotification::DeleteAction:
@ -311,7 +314,6 @@ void RDPodcastListModel::processNotification(RDNotification *notify)
case RDNotification::NoAction: case RDNotification::NoAction:
break; break;
} }
delete cast;
} }
} }