Nemcio/GitList
1
0
Fork 0
mirror of https://github.com/klaussilveira/gitlist.git synced 2025-11-17 19:20:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #788 from camilstaps/fix-391-directory-structure-is-ignored

Browse Source 
Fix #391: directory structure is ignored
This commit is contained in:
Klaus Silveira
2018-06-09 18:47:38 -04:00
committed by GitHub
parent eab6bc0762 51edf30f69
commit ec6211e8a7
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Git/Client.php
View File

@@ -157,7 +157,7 @@ class Client extends BaseClient
return $this; return $this;
} }
private function recurseDirectory($path, $topLevel = true) private function recurseDirectory($path, $appendPath = '')
{ {
$dir = new \DirectoryIterator($path); $dir = new \DirectoryIterator($path);
@@ -209,11 +209,7 @@ class Client extends BaseClient
$description = null; $description = null;
} }
if (!$topLevel) { $repoName = $appendPath . $file->getFilename();
$repoName = $file->getPathInfo()->getFilename() . '/' . $file->getFilename();
} else {
$repoName = $file->getFilename();
}
if (is_array($this->getProjects()) && !in_array($repoName, $this->getProjects())) { if (is_array($this->getProjects()) && !in_array($repoName, $this->getProjects())) {
continue; continue;
@@ -227,7 +223,7 @@ class Client extends BaseClient
continue; continue;
} }
$repositories = array_merge($repositories, $this->recurseDirectory($file->getPathname(), false)); $repositories = array_merge($repositories, $this->recurseDirectory($file->getPathname(), $appendPath . $file->getFilename() . '/'));
} }
} }