Fix up some file listing issues

SSHVersionControl · May 4, 2016 · 03f6a35 · 03f6a35
1 parent dc39659
commit 03f6a35
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 14 deletions.
diff --git a/src/VersionControl/GitCommandBundle/Entity/FileInfo.php b/src/VersionControl/GitCommandBundle/Entity/FileInfo.php
@@ -33,24 +33,47 @@ class FileInfo extends \SplFileInfo{
      */
     protected $gitLog;
 
-
+    /**
+     * Gets the git log for the file
+     * @return \VersionControl\GitCommandBundle\Entity\GitLog
+     */
     public function getGitLog() {
         return $this->gitLog;
     }
 
+    /**
+     * Sets the git log for the file
+     * @param \VersionControl\GitCommandBundle\Entity\GitLog $gitLog
+     * @return \VersionControl\GitCommandBundle\Entity\FileInfo
+     */
     public function setGitLog(GitLog $gitLog) {
         $this->gitLog = $gitLog;
         return $this;
     }  
 
+    /**
+     * Gets absolute path to file. Wrapper for SplFileInfo::getRealPath
+     * 
+     * @link http://php.net/manual/en/splfileinfo.getrealpath.php
+     * @return string
+     */
     public function getFullPath() {
         return $this->getRealPath();
     }
-
+
+    /**
+     * Gets the file path relative to the .git folder
+     * @return string
+     */
     public function getGitPath() {
         return $this->gitPath;
     }
 
+    /**
+     * Sets the file path relative to the .git folder
+     * @param string $gitPath
+     * @return \VersionControl\GitCommandBundle\Entity\FileInfo
+     */
     public function setGitPath($gitPath) {
         $this->gitPath = $gitPath;
         return $this;

diff --git a/src/VersionControl/GitCommandBundle/Entity/RemoteFileInfo.php b/src/VersionControl/GitCommandBundle/Entity/RemoteFileInfo.php
@@ -20,16 +20,45 @@
 class RemoteFileInfo{
 
     /**
-     * File full path to file
+     * Absolute path to file
      * @var string 
      */
     protected $fullPath;
 
+    /**
+     * File Extension
+     * @var string 
+     */
     protected $extension;
+
+    /**
+     * File name without any path information
+     * @var string 
+     */
     protected $filename;
+
+    /**
+     * Path without the filename
+     * @var string 
+     */
     protected $path;
+
+    /**
+     * File permissions
+     * @var string 
+     */
     protected $perms;
+
+    /**
+     * Filesize in bytes
+     * @var integer 
+     */
     protected $size;
+
+    /**
+     *
+     * @var type 
+     */
     protected $uid;
     protected $gid;
     protected $mode;
@@ -40,9 +69,7 @@ class RemoteFileInfo{
 
     protected $gitPath;
 
-
-
-
+
     /**
      * Git log Entity
      * @var GitLog 

diff --git a/src/VersionControl/GitCommandBundle/GitCommands/Command/GitFilesCommand.php b/src/VersionControl/GitCommandBundle/GitCommands/Command/GitFilesCommand.php
@@ -78,8 +78,9 @@ protected function getFileInfo($path){
 
 
             $fileData = $sftp->stat($basePath.$path);
+            $fileData['filename'] = basename($path);
             $fileData['fullPath'] = $basePath.$path;
-            $fileData['gitPath'] = $basePath.$path;
+            $fileData['gitPath'] = $path;
             $fileInfo = new RemoteFileInfo($fileData);
 
          }else{
@@ -168,7 +169,7 @@ public function getFilesInDirectory($dir){
 
             foreach($sftp->rawlist($basePath.$relativePath) as $filename => $fileData) {
                 if($filename !== '.' && $filename !== '..' && $filename !== '.git'){
-                    $fileData['fullPath'] = rtrim($relativePath,'/').'/'.$filename;
+                    $fileData['fullPath'] = $basePath.rtrim($relativePath,'/').'/'.$filename;
                     $fileData['gitPath'] = $relativePath.$filename;
 
                     $remoteFileInfo = new RemoteFileInfo($fileData);
@@ -386,7 +387,7 @@ public function filePathIsIgnored($filePath){
     public function getGitIgnoreFile(){
         $ignoreFiles = array();
 
-
+        $basePath = trim($this->addEndingSlash($this->command->getGitEnvironment()->getPath()));
         $fileData['fullPath'] = '.gitignore';
         $fileData['gitPath'] = '.gitignore';
 

diff --git a/src/VersionControl/GitControlBundle/Controller/ProjectFilesController.php b/src/VersionControl/GitControlBundle/Controller/ProjectFilesController.php
@@ -80,20 +80,24 @@ public function fileListAction($id,$currentDir = ''){
     public function viewFileAction($id,$currentFile = ''){
         $filePath = '';
         $dir = '';
+        $currentDir = '';
         if($currentFile){
             $filePath = trim(urldecode($currentFile));
 
 
             $file = $this->gitFilesCommands->getFile($filePath, $this->branchName);
-
             $fileContents = $this->gitFilesCommands->readFile($file);
 
             $pathParts = pathinfo($filePath);
             $dir = $pathParts['dirname'];
+
+            $pathParts = pathinfo($filePath);
+            $currentDir = ($pathParts['dirname'] !== '.')?$pathParts['dirname']:'';
         }
 
          return array_merge($this->viewVariables, array(
-            'currentDir' => $filePath,
+            'currentDir' => $currentDir,
+            'filePath' => $filePath,
             'fileContents' => $fileContents,
             'file' => $file
         ));

diff --git a/src/VersionControl/GitControlBundle/Resources/views/ProjectFiles/fileList.html.twig b/src/VersionControl/GitControlBundle/Resources/views/ProjectFiles/fileList.html.twig
@@ -69,8 +69,7 @@
                 {% if(currentDir) %}
                     <div class="list-group-item">
                         <div class="row">
-                            <div class="col-md-12">
-
+                            <div class="col-md-12"> 
                                 <a href="{{ path('project_filelist', { 'id': project.id, 'currentDir': currentDir|parentDir() | url_encode()})}}" title="Back to {{currentDir|parentDir()}}">
                                     <strong class="str-truncated">..</strong>
                                 </a>   

diff --git a/src/VersionControl/GitControlBundle/Resources/views/ProjectFiles/viewFile.html.twig b/src/VersionControl/GitControlBundle/Resources/views/ProjectFiles/viewFile.html.twig
@@ -40,10 +40,25 @@
         <div class="box-body">
             <p>Shows file contents of the current working directory.</p>
             <div class="list-group">
+                <div class="list-group-item">
+                    <div class="row">
+                        <div class="col-md-12"> 
+                            {% if(currentDir) %}
+                                <a href="{{ path('project_filelist', { 'id': project.id, 'currentDir': currentDir | url_encode()})}}" title="Back to /{{currentDir}}">
+                                    <strong class="str-truncated">Back to /{{currentDir}}</strong>
+                                </a> 
+                            {% else %}
+                                <a href="{{ path('project_filelist', { 'id': project.id})}}" title="Back to home folder">
+                                    <strong class="str-truncated">Back to /</strong>
+                                </a>
+                            {% endif %}
+                        </div> 
+                     </div>
+                </div>
                 <div class="list-group-item">
                     <div class="row">
                         <div class="col-md-12">
-                            <strong>Path:</strong>/{{currentDir}}
+                            <strong>Path:</strong>/{{filePath}}
                         </div>
                     </div>
                 </div>