Merge pull request #3640 from infoneo/master
Folders with multiple periods problem fix
This commit is contained in:
commit
54f3174665
|
@ -173,12 +173,7 @@ class Mapper
|
||||||
$pathElements = explode('/', $path);
|
$pathElements = explode('/', $path);
|
||||||
$sluggedElements = array();
|
$sluggedElements = array();
|
||||||
|
|
||||||
// rip off the extension ext from last element
|
|
||||||
$last= end($pathElements);
|
$last= end($pathElements);
|
||||||
$parts = pathinfo($last);
|
|
||||||
$filename = $parts['filename'];
|
|
||||||
array_pop($pathElements);
|
|
||||||
array_push($pathElements, $filename);
|
|
||||||
|
|
||||||
foreach ($pathElements as $pathElement) {
|
foreach ($pathElements as $pathElement) {
|
||||||
// remove empty elements
|
// remove empty elements
|
||||||
|
@ -192,13 +187,15 @@ class Mapper
|
||||||
// apply index to file name
|
// apply index to file name
|
||||||
if ($index !== null) {
|
if ($index !== null) {
|
||||||
$last= array_pop($sluggedElements);
|
$last= array_pop($sluggedElements);
|
||||||
|
|
||||||
|
// if filename contains periods - add index number before last period
|
||||||
|
if (preg_match('~\.[^\.]+$~i',$last,$extension)){
|
||||||
|
array_push($sluggedElements, substr($last,0,-(strlen($extension[0]))).'-'.$index.$extension[0]);
|
||||||
|
} else {
|
||||||
|
// if filename doesn't contain periods add index ofter the last char
|
||||||
array_push($sluggedElements, $last.'-'.$index);
|
array_push($sluggedElements, $last.'-'.$index);
|
||||||
}
|
}
|
||||||
|
|
||||||
// add back the extension
|
|
||||||
if (isset($parts['extension'])) {
|
|
||||||
$last= array_pop($sluggedElements);
|
|
||||||
array_push($sluggedElements, $last.'.'.$parts['extension']);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$sluggedPath = $this->unchangedPhysicalRoot.implode('/', $sluggedElements);
|
$sluggedPath = $this->unchangedPhysicalRoot.implode('/', $sluggedElements);
|
||||||
|
@ -213,8 +210,8 @@ class Mapper
|
||||||
*/
|
*/
|
||||||
private function slugify($text)
|
private function slugify($text)
|
||||||
{
|
{
|
||||||
// replace non letter or digits by -
|
// replace non letter or digits or dots by -
|
||||||
$text = preg_replace('~[^\\pL\d]+~u', '-', $text);
|
$text = preg_replace('~[^\\pL\d\.]+~u', '-', $text);
|
||||||
|
|
||||||
// trim
|
// trim
|
||||||
$text = trim($text, '-');
|
$text = trim($text, '-');
|
||||||
|
@ -228,7 +225,10 @@ class Mapper
|
||||||
$text = strtolower($text);
|
$text = strtolower($text);
|
||||||
|
|
||||||
// remove unwanted characters
|
// remove unwanted characters
|
||||||
$text = preg_replace('~[^-\w]+~', '', $text);
|
$text = preg_replace('~[^-\w\.]+~', '', $text);
|
||||||
|
|
||||||
|
// trim ending dots (for security reasons and win compatibility)
|
||||||
|
$text = preg_replace('~\.+$~', '', $text);
|
||||||
|
|
||||||
if (empty($text)) {
|
if (empty($text)) {
|
||||||
return uniqid();
|
return uniqid();
|
||||||
|
|
|
@ -45,8 +45,20 @@ class Mapper extends \PHPUnit_Framework_TestCase {
|
||||||
$this->assertEquals('D:/a/b/text', $this->mapper->slugifyPath('D:/a/b/text'));
|
$this->assertEquals('D:/a/b/text', $this->mapper->slugifyPath('D:/a/b/text'));
|
||||||
|
|
||||||
// with double dot
|
// with double dot
|
||||||
$this->assertEquals('D:/text-text.txt', $this->mapper->slugifyPath('D:/text.text.txt'));
|
$this->assertEquals('D:/text.text.txt', $this->mapper->slugifyPath('D:/text.text.txt'));
|
||||||
$this->assertEquals('D:/text-text-2.txt', $this->mapper->slugifyPath('D:/text.text.txt', 2));
|
$this->assertEquals('D:/text.text-2.txt', $this->mapper->slugifyPath('D:/text.text.txt', 2));
|
||||||
$this->assertEquals('D:/a/b/text-text.txt', $this->mapper->slugifyPath('D:/a/b/text.text.txt'));
|
$this->assertEquals('D:/a/b/text.text.txt', $this->mapper->slugifyPath('D:/a/b/text.text.txt'));
|
||||||
|
|
||||||
|
// foldername and filename with periods
|
||||||
|
$this->assertEquals('D:/folder.name.with.periods', $this->mapper->slugifyPath('D:/folder.name.with.periods'));
|
||||||
|
$this->assertEquals('D:/folder.name.with.periods/test-2.txt', $this->mapper->slugifyPath('D:/folder.name.with.periods/test.txt', 2));
|
||||||
|
$this->assertEquals('D:/folder.name.with.periods/test.txt', $this->mapper->slugifyPath('D:/folder.name.with.periods/test.txt'));
|
||||||
|
|
||||||
|
// foldername and filename with periods and spaces
|
||||||
|
$this->assertEquals('D:/folder.name.with.peri-ods', $this->mapper->slugifyPath('D:/folder.name.with.peri ods'));
|
||||||
|
$this->assertEquals('D:/folder.name.with.peri-ods/te-st-2.t-x-t', $this->mapper->slugifyPath('D:/folder.name.with.peri ods/te st.t x t', 2));
|
||||||
|
$this->assertEquals('D:/folder.name.with.peri-ods/te-st.t-x-t', $this->mapper->slugifyPath('D:/folder.name.with.peri ods/te st.t x t'));
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue