valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DiskCache: tweak how expiration is invoked

This commit is contained in:
Andrew Dolgov 2022-11-24 18:49:36 +03:00
parent 3180b35807
commit be6bc72a74
No known key found for this signature in database
GPG Key ID: 1A56B4FA25D4AF2A
4 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
classes/cache/adapter.php vendored
View File

@ -9,7 +9,6 @@ interface Cache_Adapter {
* @return int|false -1 if the file doesn't exist, false if an error occurred, size in bytes otherwise * @return int|false -1 if the file doesn't exist, false if an error occurred, size in bytes otherwise
*/ */
public function get_size(string $filename); public function get_size(string $filename);
/** /**
* @return int|false -1 if the file doesn't exist, false if an error occurred, timestamp otherwise * @return int|false -1 if the file doesn't exist, false if an error occurred, timestamp otherwise
*/ */
@ -30,5 +29,7 @@ interface Cache_Adapter {
* @return bool|int false if the file doesn't exist (or unreadable) or isn't audio/video, true if a plugin handled, otherwise int of bytes sent * @return bool|int false if the file doesn't exist (or unreadable) or isn't audio/video, true if a plugin handled, otherwise int of bytes sent
*/ */
public function send(string $filename); public function send(string $filename);
/** Catchall function to expire all subfolders/prefixes in the cache, invoked on the backend */
public function expire_all(): void; public function expire_all(): void;
} }

29
classes/diskcache.php
View File

@ -210,14 +210,17 @@ class DiskCache implements Cache_Adapter {
$this->adapter->set_dir($dir); $this->adapter->set_dir($dir);
} }
public function get_mtime(string $filename) {
return $this->adapter->get_mtime($filename);
}
public function set_dir(string $dir) : void { public function set_dir(string $dir) : void {
$this->adapter->set_dir($dir); $this->adapter->set_dir($dir);
} }
/**
* @return int|false -1 if the file doesn't exist, false if an error occurred, timestamp otherwise
*/
public function get_mtime(string $filename) {
return $this->adapter->get_mtime($filename);
}
public function make_dir(): bool { public function make_dir(): bool {
return $this->adapter->make_dir(); return $this->adapter->make_dir();
} }
@ -230,10 +233,18 @@ class DiskCache implements Cache_Adapter {
return $this->adapter->exists($filename); return $this->adapter->exists($filename);
} }
/**
* @return int|false -1 if the file doesn't exist, false if an error occurred, size in bytes otherwise
*/
public function get_size(string $filename) { public function get_size(string $filename) {
return $this->adapter->get_size($filename); return $this->adapter->get_size($filename);
} }
/**
* @param mixed $data
*
* @return int|false Bytes written or false if an error occurred.
*/
public function put(string $filename, $data) { public function put(string $filename, $data) {
return $this->adapter->put($filename, $data); return $this->adapter->put($filename, $data);
} }
@ -250,11 +261,6 @@ class DiskCache implements Cache_Adapter {
return $this->adapter->get($filename); return $this->adapter->get($filename);
} }
static function expire(): void {
$adapter = new Cache_Local();
$adapter->expire_all();
}
public function expire_all(): void { public function expire_all(): void {
$this->adapter->expire_all(); $this->adapter->expire_all();
} }
@ -283,9 +289,6 @@ class DiskCache implements Cache_Adapter {
return false; return false;
} }
/**
* @return bool|int false if the file doesn't exist (or unreadable) or isn't audio/video, true if a plugin handled, otherwise int of bytes sent
*/
public function send(string $filename) { public function send(string $filename) {
$mimetype = $this->adapter->get_mime_type($filename); $mimetype = $this->adapter->get_mime_type($filename);
@ -324,7 +327,7 @@ class DiskCache implements Cache_Adapter {
} }
public function get_fake_extension(string $filename): string { public function get_fake_extension(string $filename): string {
$mimetype = $this->get_mime_type($filename); $mimetype = $this->adapter->get_mime_type($filename);
if ($mimetype) if ($mimetype)
return isset($this->mimeMap[$mimetype]) ? $this->mimeMap[$mimetype] : ""; return isset($this->mimeMap[$mimetype]) ? $this->mimeMap[$mimetype] : "";

3
classes/rssutils.php
View File

@ -1673,7 +1673,8 @@ class RSSUtils {
} }
static function housekeeping_common(): void { static function housekeeping_common(): void {
DiskCache::expire(); $cache = new DiskCache("");
$cache->expire_all();
self::expire_lock_files(); self::expire_lock_files();
self::expire_error_log(); self::expire_error_log();