Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-12 07:35:55 +01:00
Code Issues Projects Releases Wiki Activity

2020-02-23 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Implemented superfeed in 'rdfeed.xml'.
This commit is contained in:
Fred Gleason
2020-02-23 17:24:48 -05:00
parent a2f571f759
commit 4f6c0eb2c9
30 changed files with 345 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/rdcastsearch.cpp
View File

@@ -48,21 +48,39 @@ QString RDCastSearchString(const QString &filter,bool unexp_only,
return ret;
}
QString RDCastSearch(int feed_id,const QString &filter,bool unexp_only,
bool active_only)
{
QString ret=QString().sprintf("where (FEED_ID=%d)",feed_id);
ret+=RDCastSearchString(filter,unexp_only,active_only);
return ret;
}
QString RDCastSearch(const QString &keyname,const QString &filter,
QString RDCastSearch(const QString &keyname,bool is_super,const QString &filter,
bool unexp_only,bool active_only)
{
QString ret=QString("where (KEY_NAME=\"")+
QString sql;
RDSqlQuery *q;
QString ret=QString("where (.KEY_NAME=\"")+
RDEscapeString(keyname)+"\")";
if(is_super) {
ret="where ";
sql=QString("select ")+
"MEMBER_FEED_ID "+ // 00
"from SUPERFEED_MAPS where "+
"KEY_NAME=\""+RDEscapeString(keyname)+"\"";
q=new RDSqlQuery(sql);
while(q->next()) {
ret+=QString().sprintf("PODCASTS.FEED_ID=%u || ",q->value(0).toUInt());
}
delete q;
ret=ret.left(ret.length()-3);
}
else {
sql=QString("select ")+
"ID "+ // 00
"from FEEDS where "+
"KEY_NAME=\""+RDEscapeString(keyname)+"\"";
q=new RDSqlQuery(sql);
if(q->first()) {
ret=QString().sprintf("where PODCASTS.FEED_ID=%u ",q->value(0).toUInt());
}
delete q;
}
ret+=RDCastSearchString(filter,unexp_only,active_only);
return ret;

6
lib/rdcastsearch.h
View File

@@ -2,7 +2,7 @@
//
// SQL search clause for RDCastManager
//
// (C) Copyright 2009,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2009-2020 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -21,9 +21,7 @@
#ifndef RDCASTSEARCH_H
#define RDCASTSEARCH_H
QString RDCastSearch(int feed_id,const QString &filter,bool unexp_only,
bool active_only);
QString RDCastSearch(const QString &keyname,const QString &filter,
QString RDCastSearch(const QString &keyname,bool is_super,const QString &filter,
bool unexp_only,bool active_only);

63
lib/rdfeed.cpp
View File

@@ -129,6 +129,24 @@ void RDFeed::setIsSuperfeed(bool state) const
}
QStringList RDFeed::isSubfeedOf() const
{
QStringList ret;
QString sql=QString("select ")+
"KEY_NAME "+ // 00
"from SUPERFEED_MAPS where "+
"MEMBER_KEY_NAME=\""+RDEscapeString(keyName())+"\"";
RDSqlQuery *q=new RDSqlQuery(sql);
while(q->next()) {
ret.push_back(q->value(0).toString());
}
delete q;
return ret;
}
bool RDFeed::audienceMetrics() const
{
return RDBool(RDGetSqlValue("FEEDS","KEY_NAME",feed_keyname,
@@ -636,6 +654,19 @@ bool RDFeed::postXml(QString *err_msg)
}
curl_easy_cleanup(curl);
//
// Update Enclosing Superfeeds
//
QStringList superfeeds=isSubfeedOf();
for(int i=0;i<superfeeds.size();i++) {
QString err_msg2;
RDFeed *feed=new RDFeed(superfeeds.at(i),feed_config,this);
if(!feed->postXml(&err_msg2)) {
*err_msg+="\n"+err_msg2;
}
delete feed;
}
return ret;
}
@@ -958,6 +989,22 @@ QString RDFeed::rssXml(QString *err_msg,bool *ok)
//
// Render Item XML
//
QString where;
if(isSuperfeed()) {
sql=QString("select ")+
"MEMBER_FEED_ID "+
"from SUPERFEED_MAPS where "+
QString().sprintf("FEED_ID=%d",q->value(13).toUInt());
q1=new RDSqlQuery(sql);
while(q1->next()) {
where+=QString().sprintf("(FEED_ID=%u) || ",q1->value(0).toUInt());
}
delete q1;
where=("("+where.left(where.length()-4)+") && ");
}
else {
where =QString().sprintf("(FEED_ID=%u)&&",q->value(13).toUInt());
}
sql=QString("select ")+
"ITEM_TITLE,"+ // 00
"ITEM_DESCRIPTION,"+ // 01
@@ -973,7 +1020,8 @@ QString RDFeed::rssXml(QString *err_msg,bool *ok)
"EFFECTIVE_DATETIME,"+ // 11
"ID "+ // 12
"from PODCASTS where "+
QString().sprintf("(FEED_ID=%d)&&",q->value(13).toUInt())+
where+
//QString().sprintf("(FEED_ID=%d)&&",q->value(13).toUInt())+
QString().sprintf("(STATUS=%d) ",RDPodcast::StatusActive)+
"order by ORIGIN_DATETIME";
if(q->value(15).toString()=="N") {
@@ -1116,14 +1164,19 @@ unsigned RDFeed::create(const QString &keyname,bool enable_users,
// Duplicate member feed references
//
if(q->value(0).toString()=="Y") {
sql=QString("select MEMBER_KEY_NAME ")+
"from FEED_KEY_NAMES where "+
sql=QString("select ")+
"MEMBER_KEY_NAME,"+ // 00
"FEED_ID,"+ // 01
"MEMBER_FEED_ID "+ // 02
"from SUPERFEED_MAPS where "+
"KEY_NAME=\""+RDEscapeString(exemplar)+"\"";
q1=new RDSqlQuery(sql);
while(q1->next()) {
sql=QString("insert into FEED_KEY_NAMES set ")+
sql=QString("insert into SUPERFEED_MAPS set ")+
"KEY_NAME=\""+RDEscapeString(keyname)+"\","+
"MEMBER_KEY_NAME=\""+RDEscapeString(q1->value(0).toString())+"\"";
"MEMBER_KEY_NAME=\""+RDEscapeString(q1->value(0).toString())+"\","+
QString().sprintf("FEED_ID=%u,",q1->value(1).toUInt())+
QString().sprintf("MEMBER_FEED_ID=%u",q1->value(2).toUInt());
RDSqlQuery::apply(sql);
}
delete q1;

1
lib/rdfeed.h
View File

@@ -46,6 +46,7 @@ class RDFeed : public QObject
bool exists() const;
bool isSuperfeed() const;
void setIsSuperfeed(bool state) const;
QStringList isSubfeedOf() const;
bool audienceMetrics() const;
void setAudienceMetrics(bool state);
QString channelTitle() const;

4
lib/rdpodcast.h
View File

@@ -2,7 +2,7 @@
//
// Abstract a Rivendell Podcast Entry
//
// (C) Copyright 2002-2007,2016-2017 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -66,8 +66,6 @@ class RDPodcast
void setShelfLife(unsigned days) const;
RDPodcast::Status status() const;
void setStatus(RDPodcast::Status status);
//QString audioUploadCommand(const QString &srcfile) const;
//QString audioPurgeCommand() const;
bool removeAudio(RDFeed *feed,QString *err_text,bool log_debug) const;
static QString guid(const QString &url,const QString &filename,
unsigned feed_id,unsigned cast_id);