Merge pull request #864 from MacHoel/strip_dot_git

Strip dot git
klaussilveira · Aug 25, 2021 · 434521a · 434521a
2 parents 271e6c5 + 2e0a400
commit 434521a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 1 deletion.
diff --git a/config.ini-example b/config.ini-example
@@ -3,6 +3,7 @@ client = '/usr/bin/git' ; Your git executable path
 default_branch = 'master' ; Default branch when HEAD is detached
 repositories[] = '/home/git/repositories/' ; Path to your repositories
                                            ; If you wish to add more repositories, just add a new line
+strip_dot_git = false ; Remove usual bare repo .git extension from displayed name
 
 ; WINDOWS USERS
 ;client = '"C:\Program Files (x86)\Git\bin\git.exe"' ; Your git executable path

diff --git a/src/Application.php b/src/Application.php
@@ -59,6 +59,7 @@ public function __construct(Config $config, $root = null)
                                     $config->get('git', 'hidden') : array(),
             'git.default_branch' => $config->get('git', 'default_branch') ?
                                     $config->get('git', 'default_branch') : 'master',
+	    'git.strip_dot_git' => $config->get('git', 'strip_dot_git')
         ));
 
         $this->register(new ViewUtilServiceProvider());

diff --git a/src/Git/Client.php b/src/Git/Client.php
@@ -9,13 +9,15 @@ class Client extends BaseClient
     protected $defaultBranch;
     protected $hidden;
     protected $projects;
+    protected $stripDotGit;
 
     public function __construct($options = null)
     {
         parent::__construct($options['path']);
         $this->setDefaultBranch($options['default_branch']);
         $this->setHidden($options['hidden']);
         $this->setProjects($options['projects']);
+	$this->stripDotGit = $options['strip_dot_git'];
     }
 
     public function getRepositoryFromName($paths, $repo)
@@ -209,7 +211,11 @@ private function recurseDirectory($path, $appendPath = '')
                         $description = null;
                     }
 
-                    $repoName = $appendPath . $file->getFilename();
+                    if (($file->getExtension() == 'git') and $this->stripDotGit) {
+                        $repoName = $appendPath . pathinfo($file->getFilename(), PATHINFO_FILENAME);
+                    } else {
+                        $repoName = $appendPath . $file->getFilename();
+                    }
 
                     if (is_array($this->getProjects()) && !in_array($repoName, $this->getProjects())) {
                         continue;

diff --git a/src/Provider/GitServiceProvider.php b/src/Provider/GitServiceProvider.php
@@ -16,6 +16,7 @@ public function register(Application $app)
             $options['projects'] = $app['git.projects'];
             $options['ini.file'] = $app['ini.file'];
             $options['default_branch'] = $app['git.default_branch'];
+            $options['strip_dot_git'] = $app['git.strip_dot_git'];
 
             return new Client($options);
         };

diff --git a/tests/InterfaceTest.php b/tests/InterfaceTest.php
@@ -34,6 +34,7 @@ public static function setUpBeforeClass()
         $options['hidden'] = array(self::$tmpdir . '/hiddenrepo');
         $options['default_branch'] = 'master';
         $options['ini.file'] = 'config.ini';
+        $options['strip_dot_git'] = false;
         $options['projects'] = false;
 
         $cacheDir = self::$tmpdir . DIRECTORY_SEPARATOR . 'cache';