fix crash when renaming file

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

diff --git a/src/phorkie/Repository.php b/src/phorkie/Repository.php
index d82789d54dc0ef44c26fd9d38acf659b07c7d6b4..013f017f8111e742f5bce7a2e6d00687601e28b5 100644 (file)
--- a/src/phorkie/Repository.php
+++ b/src/phorkie/Repository.php
@@ -65,6 +65,16 @@ class Repository
         $this->loadMessage();
     }
 
+    public function loadById($id)
+    {
+        if (!is_numeric($id)) {
+            throw new Exception_Input('Paste ID not numeric');
+        }
+        $this->id = (int)$id;
+        $this->loadDirs();
+        $this->loadHash();
+    }
+
     protected function loadDirs()
     {
         $gitDir = $GLOBALS['phorkie']['cfg']['gitdir'] . '/' . $this->id . '.git';
@@ -86,7 +96,6 @@ class Repository
 
     public function loadHash()
     {
-        return;
         if ($this->hash !== null) {
             return;
         }
@@ -104,6 +113,12 @@ class Repository
         $this->hash = $output;
     }
 
+    public function reloadHash()
+    {
+        $this->hash = null;
+        return $this->loadHash();
+    }
+
     /**
      * Populates $this->message
      *
@@ -126,16 +141,6 @@ class Repository
         }
     }
 
-    public function loadById($id)
-    {
-        if (!is_numeric($id)) {
-            throw new Exception_Input('Paste ID not numeric');
-        }
-        $this->id = (int)$id;
-        $this->loadDirs();
-        $this->loadHash();
-    }
-
     public function getVc()
     {
         return new \VersionControl_Git($this->gitDir);
@@ -144,7 +149,7 @@ class Repository
     /**
      * Loads the list of files in this repository
      *
-     * @return File[] Array of files
+     * @return File[] Array of file objects
      */
     public function getFiles()
     {
@@ -156,6 +161,41 @@ class Repository
         return $arFiles;
     }
 
+    /**
+     * Decodes unicode characters in git filenames
+     * They begin and end with double quote characters, and may contain
+     * backslash + 3 letter octal code numbers representing the character.
+     *
+     * For example,
+     * > "t\303\244st.txt"
+     * means
+     * > täst.txt
+     *
+     * On the shell, you can pipe them into "printf" and have them decoded.
+     *
+     * @param string Encoded git file name
+     *
+     * @return string Decoded file name
+     */
+    protected function decodeFileName($name)
+    {
+        $name = substr($name, 1, -1);
+        $name = str_replace('\"', '"', $name);
+        $name = preg_replace_callback(
+            '#\\\\[0-7]{3}#',
+            function ($ar) {
+                return chr(octdec(substr($ar[0], 1)));
+            },
+            $name
+        );
+        return $name;
+    }
+
+    /**
+     * Return array with all file paths in this repository
+     *
+     * @return array
+     */
     protected function getFilePaths()
     {
         if ($this->hash === null) {
@@ -168,7 +208,13 @@ class Repository
             ->setOption('name-only')
             ->addArgument($hash)
             ->execute();
-        return explode("\n", trim($output));
+        $files = explode("\n", trim($output));
+        foreach ($files as &$file) {
+            if ($file{0} == '"') {
+                $file = $this->decodeFileName($file);
+            }
+        }
+        return $files;
     }
 
     public function getFileByName($name, $bHasToExist = true)
@@ -208,8 +254,13 @@ class Repository
         $db = new Database();
         $db->getIndexer()->deleteRepo($this);
 
-        return Tools::recursiveDelete($this->workDir)
+        $bOk = Tools::recursiveDelete($this->workDir)
             && Tools::recursiveDelete($this->gitDir);
+
+        $not = new Notificator();
+        $not->delete($this);
+
+        return $bOk;
     }
 
     public function getTitle()
@@ -264,6 +315,7 @@ class Repository
      *                        - "delete"
      *                        - "delete-confirm"
      *                        - "display"
+     *                        - "embed"
      *                        - "fork"
      *                        - "revision"
      * @param string  $option Additional link option, e.g. revision number
@@ -274,19 +326,34 @@ class Repository
     public function getLink($type, $option = null, $full = false)
     {
         if ($type == 'edit') {
-            $link = '/' . $this->id . '/edit';
+            $link = $this->id . '/edit';
+            if ($option !== null) {
+                $link .= '/' . urlencode($option);
+            }
         } else if ($type == 'display') {
-            $link = '/' . $this->id;
+            $link = $this->id;
         } else if ($type == 'fork') {
-            $link = '/' . $this->id . '/fork';
+            $link = $this->id . '/fork';
         } else if ($type == 'doap') {
-            $link = '/' . $this->id . '/doap';
+            $link = $this->id . '/doap';
         } else if ($type == 'delete') {
-            $link = '/' . $this->id . '/delete';
+            $link = $this->id . '/delete';
         } else if ($type == 'delete-confirm') {
-            $link = '/' . $this->id . '/delete/confirm';
+            $link = $this->id . '/delete/confirm';
+        } else if ($type == 'embed') {
+            $link = $this->id . '/embed';
+        } else if ($type == 'oembed-json') {
+            $link = 'oembed.php?format=json&url='
+                . urlencode($this->getLink('display', null, true));
+        } else if ($type == 'oembed-xml') {
+            $link = 'oembed.php?format=xml&url='
+                . urlencode($this->getLink('display', null, true));
+        } else if ($type == 'remotefork') {
+            return 'web+fork:' . $this->getLink('display', null, true);
         } else if ($type == 'revision') {
-            $link = '/' . $this->id . '/rev/' . $option;
+            $link = $this->id . '/rev/' . $option;
+        } else if ($type == 'linkback') {
+            $link = $this->id . '/linkback';
         } else {
             throw new Exception('Unknown link type');
         }
@@ -359,6 +426,14 @@ class Repository
 
         return $arCommits;
     }
+
+    /**
+     * @return Repository_ConnectionInfo
+     */
+    public function getConnectionInfo()
+    {
+        return new Repository_ConnectionInfo($this);
+    }
 }
 
 ?>