Merge remote-tracking branch 'skl85/hotfix-extautodetect'

[phorkie.git] / src / phorkie / Repository.php

diff --git a/src/phorkie/Repository.php b/src/phorkie/Repository.php
index 0117ec2c012b972c7b46ea745767211fbfabb8e4..448982baa2da6c54252731382fd746cc61d832e9 100644 (file)
--- a/src/phorkie/Repository.php
+++ b/src/phorkie/Repository.php
@@ -25,6 +25,15 @@ class Repository
      */
     public $workDir;
 
+    /**
+     * Revision of the repository that shall be shown
+     *
+     * @var string
+     */
+    public $hash;
+
+
+
     /**
      * Load Repository data from GET-Request
      *
@@ -40,8 +49,13 @@ class Repository
         if (!is_numeric($_GET['id'])) {
             throw new Exception_Input('Paste ID not numeric');
         }
+        if (isset($_GET['rev'])) {
+            $this->hash = $_GET['rev'];
+        }
+
         $this->id = (int)$_GET['id'];
         $this->loadDirs();
+        $this->loadHash();
     }
 
     protected function loadDirs()
@@ -63,6 +77,26 @@ class Repository
         $this->workDir = $workDir;
     }
 
+    public function loadHash()
+    {
+        return;
+        if ($this->hash !== null) {
+            return;
+        }
+
+        $output = $this->getVc()->getCommand('log')
+            ->setOption('pretty', 'format:%H')
+            ->setOption('max-count', 1)
+            ->execute();
+        $output = trim($output);
+        if (strlen($output) !== 40) {
+            throw new Exception(
+                'Loading commit hash failed: ' . $output
+            );
+        }
+        $this->hash = $output;
+    }
+
     public function loadById($id)
     {
         if (!is_numeric($id)) {
@@ -70,6 +104,7 @@ class Repository
         }
         $this->id = (int)$id;
         $this->loadDirs();
+        $this->loadHash();
     }
 
     public function getVc()
@@ -84,28 +119,43 @@ class Repository
      */
     public function getFiles()
     {
-        $files = glob($this->workDir . '/*');
+        $files = $this->getFilePaths();
         $arFiles = array();
-        foreach ($files as $path) {
-            $arFiles[] = new File($path, $this);
+        foreach ($files as $name) {
+            $arFiles[] = new File($name, $this);
         }
         return $arFiles;
     }
 
-    public function getFileByName($name, $bHasToExist = true)
+    protected function getFilePaths()
     {
-        $base = basename($name);
-        if ($base != $name) {
-            throw new Exception('No directories supported for now');
+        if ($this->hash === null) {
+            $hash = 'HEAD';
+        } else {
+            $hash = $this->hash;
         }
+        $output = $this->getVc()->getCommand('ls-tree')
+            ->setOption('r')
+            ->setOption('name-only')
+            ->addArgument($hash)
+            ->execute();
+        return explode("\n", trim($output));
+    }
+
+    public function getFileByName($name, $bHasToExist = true)
+    {
+        $name = Tools::sanitizeFilename($name);
         if ($name == '') {
             throw new Exception_Input('Empty file name given');
         }
-        $path = $this->workDir . '/' . $base;
-        if ($bHasToExist && !is_readable($path)) {
-            throw new Exception_Input('File does not exist');
+
+        if ($bHasToExist) {
+            $files = $this->getFilePaths();
+            if (array_search($name, $files) === false) {
+                throw new Exception_Input('File does not exist');
+            }
         }
-        return new File($path, $this);
+        return new File($name, $this);
     }
 
     public function hasFile($name)
@@ -126,10 +176,23 @@ class Repository
      */
     public function delete()
     {
+        $db = new Database();
+        $db->getIndexer()->deleteRepo($this);
+
         return Tools::recursiveDelete($this->workDir)
             && Tools::recursiveDelete($this->gitDir);
     }
 
+    public function getTitle()
+    {
+        $desc = $this->getDescription();
+        if (trim($desc) != '') {
+            return $desc;
+        }
+
+        return 'paste #' . $this->id;
+    }
+
     public function getDescription()
     {
         if (!is_readable($this->gitDir . '/description')) {
@@ -148,12 +211,16 @@ class Repository
      *
      * @param string $type Link type. Supported are:
      *                     - "edit"
+     *                     - "delete"
+     *                     - "delete-confirm"
      *                     - "display"
      *                     - "fork"
+     *                     - "revision"
+     * @param string $option
      *
      * @return string
      */
-    public function getLink($type)
+    public function getLink($type, $option = null)
     {
         if ($type == 'edit') {
             return '/' . $this->id . '/edit';
@@ -165,6 +232,8 @@ class Repository
             return '/' . $this->id . '/delete';
         } else if ($type == 'delete-confirm') {
             return '/' . $this->id . '/delete/confirm';
+        } else if ($type == 'revision') {
+            return '/' . $this->id . '/rev/' . $option;
         }
         throw new Exception('Unknown link type');
     }
@@ -173,10 +242,57 @@ class Repository
     {
         $var = $public ? 'public' : 'private';
         if (isset($GLOBALS['phorkie']['cfg']['git'][$var])) {
-            return $GLOBALS['phorkie']['cfg']['git'][$var] . $this->id . '/.git';
+            return $GLOBALS['phorkie']['cfg']['git'][$var] . $this->id . '.git';
         }
         return null;
     }
+
+    /**
+     * Returns the history of the repository.
+     * We don't use VersionControl_Git's rev list fetcher since it does not
+     * give us separate email addresses and names, and it does not give us
+     * the amount of changed (added/deleted) lines.
+     *
+     * @return array Array of history objects
+     */
+    public function getHistory()
+    {
+        $output = $this->getVc()->getCommand('log')
+            ->setOption('pretty', 'format:commit %H%n%at%n%an%n%ae')
+            ->setOption('max-count', 10)
+            ->setOption('shortstat')
+            ->execute();
+
+        $arCommits = array();
+        $arOutput = explode("\n", $output);
+        $lines = count($arOutput);
+        $current = 0;
+        while ($current < $lines) {
+            $commit = new Repository_Commit();
+            list($name,$commit->hash) = explode(' ', $arOutput[$current]);
+            if ($name !== 'commit') {
+                throw new Exception(
+                    'Git log output format not as expected: ' . $arOutput[$current]
+                );
+            }
+            $commit->committerTime  = $arOutput[$current + 1];
+            $commit->committerName  = $arOutput[$current + 2];
+            $commit->committerEmail = $arOutput[$current + 3];
+
+            $arLineParts = explode(' ', trim($arOutput[$current + 4]));
+            $commit->filesChanged = $arLineParts[0];
+            $commit->linesAdded   = $arLineParts[3];
+            if (isset($arLineParts[5])) {
+                $commit->linesDeleted = $arLineParts[5];
+            }
+
+            $current += 6;
+
+            $arCommits[] = $commit;
+        }
+
+        return $arCommits;
+    }
 }
 
 ?>