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

Merge pull request #664 from sanmadjack/path_to_tags_enhancements

Browse Source 
Path to tags enhancements
This commit is contained in:
Shish 2019-06-21 08:45:52 +01:00 committed by GitHub
commit 7e34a30a2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
core/util.php
View File

@ -281,21 +281,45 @@ function manual_include(string $fname): ?string
function path_to_tags(string $path): string function path_to_tags(string $path): string
{ {
$matches = []; $matches = [];
$tags = ""; $tags = [];
if (preg_match("/\d+ - (.*)\.([a-zA-Z0-9]+)/", basename($path), $matches)) { if(preg_match("/\d+ - (.+)\.([a-zA-Z0-9]+)/", basename($path), $matches)) {
$tags = $matches[1]; $tags = explode(" ",$matches[1]);
} }
$dir_tags = dirname($path); $path = dirname($path);
$dir_tags = str_replace("/", " ", $dir_tags); $path = str_replace(";", ":", $path);
$dir_tags = str_replace("__", " ", $dir_tags); $path = str_replace("__", " ", $path);
$dir_tags = trim($dir_tags);
if ($dir_tags != "") {
$tags = trim($tags)." ".trim($dir_tags);
}
$tags = trim($tags);
return $tags;
$category = "";
foreach(explode("/", $path) as $dir) {
$category_to_inherit = "";
foreach(explode(" ", $dir) as $tag) {
$tag = trim($tag);
if($tag=="") {
continue;
}
if(substr_compare($tag, ":", -1) === 0) {
// This indicates a tag that ends in a colon,
// which is for inheriting to tags on the subfolder
$category_to_inherit = $tag;
} else {
if($category!=""&&strpos($tag, ":") === false) {
// This indicates that category inheritance is active,
// and we've encountered a tag that does not specify a category.
// So we attach the inherited category to the tag.
$tag = $category.$tag;
}
$tags[] = $tag;
}
}
// Category inheritance only works on the immediate subfolder,
// so we hold a category until the next iteration, and then set
// it back to an empty string after that iteration
$category = $category_to_inherit;
}
return implode(" ",$tags);
} }