clean up 'update_items'
This commit is contained in:
parent
3748606e21
commit
0bb9a81d60
4 changed files with 104 additions and 34 deletions
|
|
@ -19,8 +19,8 @@ CREATE TABLE items (
|
||||||
id INTEGER PRIMARY KEY,
|
id INTEGER PRIMARY KEY,
|
||||||
channel_id INTEGER NOT NULL,
|
channel_id INTEGER NOT NULL,
|
||||||
guid TEXT NOT NULL,
|
guid TEXT NOT NULL,
|
||||||
fetched_at TEXT NOT NULL,
|
|
||||||
|
|
||||||
|
fetched_at TEXT,
|
||||||
title TEXT,
|
title TEXT,
|
||||||
description TEXT,
|
description TEXT,
|
||||||
content TEXT,
|
content TEXT,
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ use crate::{
|
||||||
db::{
|
db::{
|
||||||
ChannelId,
|
ChannelId,
|
||||||
Item,
|
Item,
|
||||||
|
FeedId,
|
||||||
item::UnparsedItem,
|
item::UnparsedItem,
|
||||||
},
|
},
|
||||||
fetch::FetchedRSSChannel,
|
fetch::FetchedRSSChannel,
|
||||||
|
|
@ -33,6 +34,40 @@ impl UnparsedChannel {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub struct UnparsedFeedChannel {
|
||||||
|
pub channel_id: i64,
|
||||||
|
pub feed_id: i64,
|
||||||
|
}
|
||||||
|
impl UnparsedFeedChannel {
|
||||||
|
pub fn parse(self) -> Result<FeedChannel> {
|
||||||
|
Ok(FeedChannel {
|
||||||
|
channel_id: ChannelId(self.channel_id),
|
||||||
|
feed_id: FeedId(self.feed_id)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct FeedChannel {
|
||||||
|
channel_id: ChannelId,
|
||||||
|
feed_id: FeedId,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl FeedChannel {
|
||||||
|
pub async fn add_item(
|
||||||
|
&self, pool: &AdapterPool, item: &Item
|
||||||
|
) -> Result<()> {
|
||||||
|
let int_item_id = i64::from(item.id());
|
||||||
|
let int_feed_id = i64::from(self.feed_id);
|
||||||
|
|
||||||
|
sqlx::query!(
|
||||||
|
"INSERT OR IGNORE INTO feed_items (feed_id, item_id, score)
|
||||||
|
VALUES (?, ?, 5)", // TODO: Add in scoring featuress
|
||||||
|
int_feed_id, int_item_id
|
||||||
|
).execute(&pool.0).await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub struct Channel {
|
pub struct Channel {
|
||||||
id: ChannelId,
|
id: ChannelId,
|
||||||
title: String,
|
title: String,
|
||||||
|
|
@ -108,24 +143,34 @@ impl Channel {
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn get_feed_channels(
|
||||||
|
&self, pool: &AdapterPool
|
||||||
|
) -> Result<Vec<FeedChannel>> {
|
||||||
|
let feeds: Result<Vec<FeedChannel>> = sqlx::query_as!(
|
||||||
|
UnparsedFeedChannel,
|
||||||
|
"SELECT channel_id, feed_id
|
||||||
|
FROM feed_channels
|
||||||
|
WHERE channel_id = ?",
|
||||||
|
self.id.0
|
||||||
|
).fetch_all(&pool.0).await?.into_iter()
|
||||||
|
.map(UnparsedFeedChannel::parse).collect();
|
||||||
|
|
||||||
|
feeds
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn update_items(
|
pub async fn update_items(
|
||||||
&self, pool: &AdapterPool, fetched: FetchedRSSChannel
|
&self, pool: &AdapterPool, fetched: FetchedRSSChannel
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
let fetched_at = fetched.fetched_at().to_rfc2822();
|
let fetched_at = fetched.fetched_at();
|
||||||
|
|
||||||
for item in fetched.items() {
|
let feed_channels = self.get_feed_channels(pool).await?;
|
||||||
let guid = item.guid();
|
|
||||||
let title = item.title();
|
for rss_item in fetched.items() {
|
||||||
let description = item.description();
|
let new_item = Item::get_or_create(pool, self.id, rss_item.guid()).await?;
|
||||||
let content = item.content();
|
new_item.update_content(pool, rss_item, &fetched_at).await?;
|
||||||
sqlx::query!(
|
for feed_channel in &feed_channels {
|
||||||
"INSERT OR IGNORE INTO items
|
feed_channel.add_item(pool, &new_item).await?;
|
||||||
(channel_id, guid, fetched_at, title, description, content)
|
}
|
||||||
VALUES (?, ?, ?, ?, ?, ?)",
|
|
||||||
self.id.0, guid, fetched_at, title, description, content
|
|
||||||
)
|
|
||||||
.execute(&pool.0)
|
|
||||||
.await?;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|
@ -134,7 +179,7 @@ impl Channel {
|
||||||
pub async fn get_items(&self, pool: &AdapterPool) -> Result<Vec<Item>> {
|
pub async fn get_items(&self, pool: &AdapterPool) -> Result<Vec<Item>> {
|
||||||
let items: Result<Vec<Item>> = sqlx::query_as!(
|
let items: Result<Vec<Item>> = sqlx::query_as!(
|
||||||
UnparsedItem,
|
UnparsedItem,
|
||||||
"SELECT id as `id!`, channel_id, guid, fetched_at, title, description,
|
"SELECT id as `id!`, channel_id, fetched_at, title, description,
|
||||||
content
|
content
|
||||||
FROM items
|
FROM items
|
||||||
WHERE channel_id = ?",
|
WHERE channel_id = ?",
|
||||||
|
|
|
||||||
|
|
@ -90,8 +90,8 @@ impl Feed {
|
||||||
) -> Result<Vec<Item>> {
|
) -> Result<Vec<Item>> {
|
||||||
let items: Result<Vec<Item>> = sqlx::query_as!(
|
let items: Result<Vec<Item>> = sqlx::query_as!(
|
||||||
UnparsedItem,
|
UnparsedItem,
|
||||||
"SELECT i.id as `id!`, i.channel_id, i.guid, i.fetched_at, i.title,
|
"SELECT i.id as `id!`, i.channel_id, i.fetched_at, i.title, i.description,
|
||||||
i.description, i.content
|
i.content
|
||||||
FROM items i
|
FROM items i
|
||||||
JOIN feed_items fi on i.id = fi.item_id
|
JOIN feed_items fi on i.id = fi.item_id
|
||||||
WHERE feed_id = ? AND archived = FALSE
|
WHERE feed_id = ? AND archived = FALSE
|
||||||
|
|
|
||||||
|
|
@ -4,15 +4,15 @@ use crate::{
|
||||||
db::{
|
db::{
|
||||||
ChannelId,
|
ChannelId,
|
||||||
ItemId,
|
ItemId,
|
||||||
}
|
},
|
||||||
|
fetch::FetchedRSSItem,
|
||||||
};
|
};
|
||||||
use chrono::{DateTime, Utc};
|
use chrono::{DateTime, Utc};
|
||||||
|
|
||||||
pub struct UnparsedItem {
|
pub struct UnparsedItem {
|
||||||
pub id: i64,
|
pub id: i64,
|
||||||
pub channel_id: i64,
|
pub channel_id: i64,
|
||||||
pub guid: String,
|
pub fetched_at: Option<String>,
|
||||||
pub fetched_at: String,
|
|
||||||
|
|
||||||
pub title: Option<String>,
|
pub title: Option<String>,
|
||||||
pub description: Option<String>,
|
pub description: Option<String>,
|
||||||
|
|
@ -24,8 +24,10 @@ impl UnparsedItem {
|
||||||
Ok(Item {
|
Ok(Item {
|
||||||
id: ItemId(self.id),
|
id: ItemId(self.id),
|
||||||
channel_id: ChannelId(self.channel_id),
|
channel_id: ChannelId(self.channel_id),
|
||||||
guid: self.guid,
|
fetched_at: self.fetched_at.as_deref()
|
||||||
fetched_at: DateTime::parse_from_rfc2822(&self.fetched_at)?.with_timezone(&Utc),
|
.map(DateTime::parse_from_rfc2822)
|
||||||
|
.transpose()?
|
||||||
|
.map(|dt| dt.with_timezone(&Utc)),
|
||||||
|
|
||||||
title: self.title,
|
title: self.title,
|
||||||
description: self.description,
|
description: self.description,
|
||||||
|
|
@ -37,32 +39,55 @@ impl UnparsedItem {
|
||||||
pub struct Item {
|
pub struct Item {
|
||||||
id: ItemId,
|
id: ItemId,
|
||||||
channel_id: ChannelId,
|
channel_id: ChannelId,
|
||||||
guid: String,
|
|
||||||
fetched_at: DateTime<Utc>,
|
|
||||||
|
|
||||||
|
fetched_at: Option<DateTime<Utc>>,
|
||||||
title: Option<String>,
|
title: Option<String>,
|
||||||
description: Option<String>,
|
description: Option<String>,
|
||||||
content: Option<String>,
|
content: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Item {
|
impl Item {
|
||||||
|
pub fn id(&self) -> ItemId { self.id }
|
||||||
|
pub fn channel(&self) -> ChannelId { self.channel_id }
|
||||||
|
pub fn title(&self) -> Option<&str> { self.title.as_deref() }
|
||||||
|
pub fn description(&self) -> Option<&str> { self.description.as_deref() }
|
||||||
|
pub fn content(&self) -> Option<&str> { self.content.as_deref() }
|
||||||
|
|
||||||
pub async fn get_or_create(
|
pub async fn get_or_create(
|
||||||
pool: &AdapterPool, from_channel: ChannelId, guid: &str,
|
pool: &AdapterPool, from_channel: ChannelId, guid: &str
|
||||||
fetched_at: DateTime<Utc>
|
|
||||||
) -> Result<Self> {
|
) -> Result<Self> {
|
||||||
let int_channel_id = i64::from(from_channel);
|
let int_channel_id = i64::from(from_channel);
|
||||||
let last_fetched = fetched_at.to_rfc2822();
|
|
||||||
|
|
||||||
let item = sqlx::query_as!(
|
let item = sqlx::query_as!(
|
||||||
UnparsedItem,
|
UnparsedItem,
|
||||||
"INSERT INTO items (channel_id, guid, fetched_at)
|
"INSERT INTO items (channel_id, guid)
|
||||||
VALUES(?, ?, ?)
|
VALUES(?, ?)
|
||||||
ON CONFLICT(id) DO UPDATE SET id = id
|
ON CONFLICT(id) DO UPDATE SET id = id
|
||||||
RETURNING id as `id!`, channel_id, guid, fetched_at, title, description,
|
RETURNING id as `id!`, channel_id, fetched_at, title, description,
|
||||||
content",
|
content",
|
||||||
int_channel_id, guid, last_fetched
|
int_channel_id, guid
|
||||||
).fetch_one(&pool.0).await?.parse();
|
).fetch_one(&pool.0).await?.parse();
|
||||||
|
|
||||||
item
|
item
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn update_content(
|
||||||
|
&self, pool: &AdapterPool, fetched: &FetchedRSSItem, fetched_at: &DateTime<Utc>
|
||||||
|
) -> Result<()> {
|
||||||
|
let title = fetched.title();
|
||||||
|
let description = fetched.description();
|
||||||
|
let content = fetched.content();
|
||||||
|
let string_fetched_at = fetched_at.to_rfc2822();
|
||||||
|
|
||||||
|
sqlx::query!(
|
||||||
|
"UPDATE items
|
||||||
|
SET title = ?, description = ?, content = ?,
|
||||||
|
fetched_at = ?
|
||||||
|
WHERE id = ?",
|
||||||
|
title, description, content, string_fetched_at,
|
||||||
|
self.id.0
|
||||||
|
).execute(&pool.0).await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue