servers
/
ttrss
mirror of https://tt-rss.org/git/tt-rss.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'feature/rssutils-use-feedenclosure' into 'master' 

Use FeedEnclosure throughout RSSUtils.

See merge request tt-rss/tt-rss!22
This commit is contained in:
Andrew Dolgov 2024-01-28 11:34:03 +00:00
parent a86df7eac8 21aebd8ff1
commit c7e36e1a0c
1 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
classes/RSSUtils.php
View File

@ -806,35 +806,35 @@ class RSSUtils {
// enclosures // enclosures
/** @var array<int, FeedEnclosure> */
$enclosures = array(); $enclosures = array();
$encs = $item->get_enclosures(); $encs = $item->get_enclosures();
if (is_array($encs)) { foreach ($encs as $e) {
foreach ($encs as $e) { $pluginhost->chain_hooks_callback(PluginHost::HOOK_ENCLOSURE_IMPORTED,
function ($result) use (&$e) {
$e = $result;
},
$e, $feed);
$pluginhost->chain_hooks_callback(PluginHost::HOOK_ENCLOSURE_IMPORTED, $e->link = UrlHelper::rewrite_relative($feed_obj->site_url, $e->link, "", "", $e->type);
function ($result) use (&$e) {
$e = $result;
},
$e, $feed);
// TODO: Just use FeedEnclosure (and modify it to cover whatever justified this)? if (!$e->link) {
$e_item = array( Debug::log('Skipping enclosure whose link failed validation.', Debug::LOG_VERBOSE);
UrlHelper::rewrite_relative($feed_obj->site_url, $e->link, "", "", $e->type), continue;
$e->type, $e->length, $e->title, $e->width, $e->height); }
// Yet another episode of "mysql utf8_general_ci is gimped" // Yet another episode of "mysql utf8_general_ci is gimped"
if (Config::get(Config::DB_TYPE) == "mysql" && Config::get(Config::MYSQL_CHARSET) != "UTF8MB4") { if (Config::get(Config::DB_TYPE) == "mysql" && Config::get(Config::MYSQL_CHARSET) != "UTF8MB4") {
for ($i = 0; $i < count($e_item); $i++) { foreach ((array)$e as $prop => $val) {
if (is_string($e_item[$i])) { if (is_string($val)) {
$e_item[$i] = self::strip_utf8mb4($e_item[$i]); $e->$prop = self::strip_utf8mb4($val);
}
} }
} }
array_push($enclosures, $e_item);
} }
array_push($enclosures, $e);
} }
$article = array("owner_uid" => $feed_obj->owner_uid, // read only $article = array("owner_uid" => $feed_obj->owner_uid, // read only
@ -1000,6 +1000,7 @@ class RSSUtils {
$entry_language = $article["language"]; $entry_language = $article["language"];
$entry_timestamp = $article["timestamp"]; $entry_timestamp = $article["timestamp"];
$num_comments = $article["num_comments"]; $num_comments = $article["num_comments"];
/** @var array<int, FeedEnclosure> */
$enclosures = $article["enclosures"]; $enclosures = $article["enclosures"];
if ($entry_timestamp == -1 || !$entry_timestamp || $entry_timestamp > time()) { if ($entry_timestamp == -1 || !$entry_timestamp || $entry_timestamp > time()) {
@ -1235,17 +1236,10 @@ class RSSUtils {
(?, ?, ?, ?, ?, ?, ?)"); (?, ?, ?, ?, ?, ?, ?)");
foreach ($enclosures as $enc) { foreach ($enclosures as $enc) {
$enc_url = $enc[0]; $esth->execute([$enc->link, $enc->type, $entry_ref_id]);
$enc_type = $enc[1];
$enc_dur = (int)$enc[2];
$enc_title = $enc[3];
$enc_width = intval($enc[4]);
$enc_height = intval($enc[5]);
$esth->execute([$enc_url, $enc_type, $entry_ref_id]);
if (!$esth->fetch()) { if (!$esth->fetch()) {
$usth->execute([$enc_url, $enc_type, (string)$enc_title, $enc_dur, $entry_ref_id, $enc_width, $enc_height]); $usth->execute([$enc->link, $enc->type, (string)$enc->title, (int)$enc->length, $entry_ref_id, (int)$enc->width, (int)$enc->height]);
} }
} }
@ -1360,7 +1354,7 @@ class RSSUtils {
/** /**
* TODO: move to DiskCache? * TODO: move to DiskCache?
* *
* @param array<int, array<string>> $enclosures An array of "enclosure arrays" [string $link, string $type, string $length, string, $title, string $width, string $height] * @param array<int, FeedEnclosure> $enclosures
* @see RSSUtils::update_rss_feed() * @see RSSUtils::update_rss_feed()
* @see FeedEnclosure * @see FeedEnclosure
*/ */
@ -1370,8 +1364,8 @@ class RSSUtils {
if ($cache->is_writable()) { if ($cache->is_writable()) {
foreach ($enclosures as $enc) { foreach ($enclosures as $enc) {
if (preg_match("/(image|audio|video)/", $enc[1])) { if (preg_match("/(image|audio|video)/", $enc->type)) {
$src = UrlHelper::rewrite_relative($site_url, $enc[0]); $src = UrlHelper::rewrite_relative($site_url, $enc->link);
$local_filename = sha1($src); $local_filename = sha1($src);