badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed path_to_tags to interpret ; as : and to allow inheriting categories from parent folders

Browse source
This commit is contained in:
Matthew Barbour 2019-06-14 09:45:40 -05:00 committed by matthew
parent 44fcc3a1e9
commit 85b6bba689
1 changed files with 36 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
core/util.php
View file

@ -281,21 +281,44 @@ 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]," ");
} }
$path = dirname($path);
$path = str_replace(";", ":", $path);
$path = str_replace("__", " ", $path);
$dir_tags = dirname($path);
$dir_tags = str_replace("/", " ", $dir_tags); $category = "";
$dir_tags = str_replace("__", " ", $dir_tags); foreach(explode("/", $path) as $dir) {
$dir_tags = trim($dir_tags); $category_to_inherit = "";
if ($dir_tags != "") { foreach(explode(" ", $dir) as $tag) {
$tags = trim($tags)." ".trim($dir_tags); $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;
}
array_push($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;
} }
$tags = trim($tags); return implode(" ",$tags);
return $tags;
} }