james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed path tag handling to merge path tags with filename tags

Browse Source 
Added 0-9 to the filename tag regexp so that extensions like mp4 will be picked up as well.
This commit is contained in:
matthew 2019-06-02 13:27:24 -05:00
parent 5a2f893667
commit e651da03cc
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/util.php
View File

@ -281,14 +281,20 @@ function manual_include(string $fname): ?string
function path_to_tags(string $path): string function path_to_tags(string $path): string
{ {
$matches = []; $matches = [];
if (preg_match("/\d+ - (.*)\.([a-zA-Z]+)/", basename($path), $matches)) { $tags = "";
if(preg_match("/\d+ - (.*)\.([a-zA-Z0-9]+)/", basename($path), $matches)) {
$tags = $matches[1]; $tags = $matches[1];
} else {
$tags = dirname($path);
$tags = str_replace("/", " ", $tags);
$tags = str_replace("__", " ", $tags);
$tags = trim($tags);
} }
$dir_tags = dirname($path);
$dir_tags = str_replace("/", " ", $dir_tags);
$dir_tags = str_replace("__", " ", $dir_tags);
$dir_tags = trim($dir_tags);
if ($dir_tags != "") {
$tags = trim($tags)." ".trim($dir_tags);
}
$tags = trim ( $tags );
return $tags; return $tags;
} }