X-Git-Url: https://git.cweiske.de/phorkie.git/blobdiff_plain/39bd200baed00b5b63cc62ce947ef708710ac81c..35764754559c893569625c115707eb3bf73d1cfd:/src/phorkie/Repository.php

diff --git a/src/phorkie/Repository.php b/src/phorkie/Repository.php
index 6c71b47..c854cf1 100644
--- a/src/phorkie/Repository.php
+++ b/src/phorkie/Repository.php
@@ -118,6 +118,16 @@ class Repository
      * @return File[] Array of files
      */
     public function getFiles()
+    {
+        $files = $this->getFilePaths();
+        $arFiles = array();
+        foreach ($files as $name) {
+            $arFiles[] = new File($name, $this);
+        }
+        return $arFiles;
+    }
+
+    protected function getFilePaths()
     {
         if ($this->hash === null) {
             $hash = 'HEAD';
@@ -129,28 +139,23 @@ class Repository
             ->setOption('name-only')
             ->addArgument($hash)
             ->execute();
-        $files = explode("\n", trim($output));
-        $arFiles = array();
-        foreach ($files as $name) {
-            $arFiles[] = new File($name, $this);
-        }
-        return $arFiles;
+        return explode("\n", trim($output));
     }
 
     public function getFileByName($name, $bHasToExist = true)
     {
-        $base = basename($name);
-        if ($base != $name) {
-            throw new Exception('No directories supported for now');
-        }
+        $name = Tools::sanitizeFilename($name);
         if ($name == '') {
             throw new Exception_Input('Empty file name given');
         }
-        $fullpath = $this->workDir . '/' . $base;
-        if ($bHasToExist && !is_readable($fullpath)) {
-            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($base, $this);
+        return new File($name, $this);
     }
 
     public function hasFile($name)