mirrors/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/fox/tt-rss.git synced 2025-10-18 14:31:00 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'feed-icons-misc' into 'master'

Browse Source 
Feed icons cleanup

See merge request tt-rss/tt-rss!99
This commit is contained in:
Andrew Dolgov 2025-01-27 05:39:13 +00:00
commit 59b94a9e45
4 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.docker/app/backup.sh
View File

@ -18,7 +18,7 @@ if pg_isready -h $TTRSS_DB_HOST -U $TTRSS_DB_USER -p $TTRSS_DB_PORT; then
echo backing up tt-rss local directories to $DST_DIR/$DST_FILE... echo backing up tt-rss local directories to $DST_DIR/$DST_FILE...
tar -cz -f $DST_DIR/$DST_FILE $APP_ROOT/*.local \ tar -cz -f $DST_DIR/$DST_FILE $APP_ROOT/*.local \
$APP_ROOT/feed-icons/ \ $APP_ROOT/cache/feed-icons/ \
$APP_ROOT/config.php $APP_ROOT/config.php
echo cleaning up... echo cleaning up...

21
classes/API.php
View File

@ -366,22 +366,19 @@ class API extends Handler {
} }
/** /**
* @see RPC::_make_init_params()
* @see RPC::_make_runtime_info()
* @return array<string, array<string, string>|bool|int|string> * @return array<string, array<string, string>|bool|int|string>
*/ */
private function _get_config(): array { private function _get_config(): array {
$config = [ return [
"icons_dir" => Config::get(Config::ICONS_DIR), 'custom_sort_types' => $this->_get_custom_sort_types(),
"icons_url" => Config::get(Config::ICONS_URL) 'daemon_is_running' => file_is_locked('update_daemon.lock'),
]; 'icons_url' => Config::get_self_url() . '/public.php',
'num_feeds' => ORM::for_table('ttrss_feeds')
$config["daemon_is_running"] = file_is_locked("update_daemon.lock");
$config["custom_sort_types"] = $this->_get_custom_sort_types();
$config["num_feeds"] = ORM::for_table('ttrss_feeds')
->where('owner_uid', $_SESSION['uid']) ->where('owner_uid', $_SESSION['uid'])
->count(); ->count(),
];
return $config;
} }
function getConfig(): bool { function getConfig(): bool {

4
classes/Config.php
View File

@ -73,9 +73,6 @@ class Config {
/** directory for feed favicons (directory must be writable) */ /** directory for feed favicons (directory must be writable) */
const ICONS_DIR = "ICONS_DIR"; const ICONS_DIR = "ICONS_DIR";
/** URL for feed favicons */
const ICONS_URL = "ICONS_URL";
/** auto create users authenticated via external modules */ /** auto create users authenticated via external modules */
const AUTH_AUTO_CREATE = "AUTH_AUTO_CREATE"; const AUTH_AUTO_CREATE = "AUTH_AUTO_CREATE";
@ -208,7 +205,6 @@ class Config {
Config::LOCK_DIRECTORY => [ "lock", Config::T_STRING ], Config::LOCK_DIRECTORY => [ "lock", Config::T_STRING ],
Config::CACHE_DIR => [ "cache", Config::T_STRING ], Config::CACHE_DIR => [ "cache", Config::T_STRING ],
Config::ICONS_DIR => [ "feed-icons", Config::T_STRING ], Config::ICONS_DIR => [ "feed-icons", Config::T_STRING ],
Config::ICONS_URL => [ "feed-icons", Config::T_STRING ],
Config::AUTH_AUTO_CREATE => [ "true", Config::T_BOOL ], Config::AUTH_AUTO_CREATE => [ "true", Config::T_BOOL ],
Config::AUTH_AUTO_LOGIN => [ "true", Config::T_BOOL ], Config::AUTH_AUTO_LOGIN => [ "true", Config::T_BOOL ],
Config::FORCE_ARTICLE_PURGE => [ 0, Config::T_INT ], Config::FORCE_ARTICLE_PURGE => [ 0, Config::T_INT ],

5
classes/RSSUtils.php
View File

@ -1743,7 +1743,10 @@ class RSSUtils {
$tmph->run_hooks(PluginHost::HOOK_HOUSE_KEEPING); $tmph->run_hooks(PluginHost::HOOK_HOUSE_KEEPING);
} }
/** migrates favicons from legacy storage in feed-icons/ to cache/feed-icons/using new naming (sans .ico suffix) */ /**
* migrates favicons from legacy storage in feed-icons/ to cache/feed-icons/using new naming (sans .ico suffix)
* @todo Remove this and Config::ICONS_DIR at some point
*/
static function migrate_feed_icons() : void { static function migrate_feed_icons() : void {
$old_dir = Config::get(Config::ICONS_DIR); $old_dir = Config::get(Config::ICONS_DIR);