Nemcio/GitList
1
0
Fork 0
mirror of https://github.com/klaussilveira/gitlist.git synced 2026-04-14 16:37:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #356 from gza/master

Browse Source 
Add contextual Readme display
This commit is contained in:
Klaus Silveira
2014-09-02 17:05:55 -03:00
parent 6c99ffee4c 925df1e4c0
commit e535ddc4c5
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/GitList/Controller/TreeController.php
View File

@@ -41,7 +41,7 @@ class TreeController implements ControllerProviderInterface
'breadcrumbs' => $breadcrumbs,
'branches' => $repository->getBranches(),
'tags' => $repository->getTags(),
'readme' => $app['util.repository']->getReadme($repository, $branch),
'readme' => $app['util.repository']->getReadme($repository, $branch, $tree ? "$tree" : ""),
));
})->assert('repo', $app['util.routing']->getRepositoryRegex())
->assert('commitishPath', $app['util.routing']->getCommitishPathRegex())

12
src/GitList/Util/Repository.php
View File

@@ -164,22 +164,26 @@ class Repository
return false;
}
public function getReadme($repository, $branch = null)
public function getReadme($repository, $branch = null, $path = "")
{
$files = $repository->getTree($branch)->output();
if ($branch === null) {
$branch = $repository->getHead();
}
if ($path != "") $path = "$path/";
$files = $repository->getTree($path != "" ? "$branch:$path" : $branch)->output();
foreach ($files as $file) {
if (preg_match('/^readme*/i', $file['name'])) {
return array(
'filename' => $file['name'],
'content' => $repository->getBlob("$branch:\"{$file['name']}\"")->output()
'content' => $repository->getBlob("$branch:\"$path{$file['name']}\"")->output()
);
}
}
// No contextual readme, try to catch the main one if we are in deeper context
if ($path != "") return $this->getReadme($repository, $branch, "");
return array();
}