Skip to content

Support for digits at start of pseudo pattern filename. #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support for digits at start of pseudo pattern filename. #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Support for digits at start of pseudo pattern filename. 
Resolves #114
  • Loading branch information
@notacouch
notacouch committed Jul 20, 2017
commit 0ff1cc6775686b137370db787e983ba8a8fa4cdd
2 changes: 1 addition & 1 deletion src/PatternLab/PatternData/Rule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ protected function compareProp($name, $propCompare, $exact = false) {
*/
protected function getPatternName($pattern, $clean = true) {
$patternBits = explode("-",$pattern,2);
$patternName = (((int)$patternBits[0] != 0) || ($patternBits[0] == '00')) ? $patternBits[1] : $pattern;
$patternName = (((int)$patternBits[0] != 0) || (preg_match('/^0+$/', $patternBits[0]) === 1)) ? $patternBits[1] : $pattern;
return ($clean) ? (str_replace("-"," ",$patternName)) : $patternName;
}

Expand Down
18 changes: 14 additions & 4 deletions src/PatternLab/PatternData/Rules/PseudoPatternRule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,21 @@ public function run($depth, $ext, $path, $pathName, $name) {

// check the original pattern path. if it doesn't exist make a guess
$patternPathOrig = PatternData::getPatternOption($patternBaseOrig,"pathName"); // 04-pages/00-homepage
$patternPathOrigDash = PatternData::getPatternOption($patternBaseOrig,"pathDash"); // 04-pages-00-homepage
$patternPathOrigDash = PatternData::getPatternOption($patternBaseOrig,"pathDash"); // 04-pages-00-homepage
if (!$patternPathOrig) {
$patternPathOrigBits = explode("~",$pathName);
$patternPathOrig = $patternPathOrigBits[0]; // 04-pages/00-homepage
$patternPathOrigDash = str_replace($dirSep,"-",$patternPathOrig); // 04-pages-00-homepage

if (($patternBase . $ext) != $patternFull) {
$patternPathOrig = $path . DIRECTORY_SEPARATOR . $patternBaseDash; // 04-pages/homepage
$patternPathOrigDash = str_replace($dirSep,"-",$patternPathOrig); // 04-pages-homepage

if ( ! file_exists(Config::getOption("patternSourceDir").DIRECTORY_SEPARATOR.$patternPathOrig.'.'.Config::getOption("patternExtension"))) {
$patternPathOrig = $path . DIRECTORY_SEPARATOR . '_' . $patternBaseDash; // 04-pages/_homepage
}
} else {
$patternPathOrigBits = explode("~",$pathName);
$patternPathOrig = $patternPathOrigBits[0]; // 04-pages/00-homepage
$patternPathOrigDash = str_replace($dirSep,"-",$patternPathOrig); // 04-pages-00-homepage
}
}

// create a key for the data store
Expand Down