X-Git-Url: https://git.cweiske.de/phorkie.git/blobdiff_plain/5d76ec85a500321127ac879ffaa0aabd686bb7bf..6bde4b82ec04ee5a1622220663bcacca2ec301d6:/src/phorkie/File.php

diff --git a/src/phorkie/File.php b/src/phorkie/File.php
index acc44cd..db773df 100644
--- a/src/phorkie/File.php
+++ b/src/phorkie/File.php
@@ -61,7 +61,10 @@ class File
     public function getContent()
     {
         if ($this->repo->hash) {
-            return $this->repo->getVc()->getCommand('show')
+            //quick hack until https://pear.php.net/bugs/bug.php?id=19385 is fixed
+            $cmd = new GitCommandBinary($this->repo->getVc());
+            $cmd->setSubCommand('show');
+            return $cmd
                 ->addArgument($this->repo->hash . ':' . $this->path)
                 ->execute();
         }
@@ -76,11 +79,11 @@ class File
 
         if (isset($GLOBALS['phorkie']['languages'][$ext]['renderer'])) {
             $class = $GLOBALS['phorkie']['languages'][$ext]['renderer'];
+        } else if ($this->isText()) {
+            $class = '\\phorkie\\Renderer_Geshi';
         } else if (isset($GLOBALS['phorkie']['languages'][$ext]['mime'])) {
             $type = $GLOBALS['phorkie']['languages'][$ext]['mime'];
-            if (substr($type, 0, 5) == 'text/') {
-                $class = '\\phorkie\\Renderer_Geshi';
-            } else if (substr($type, 0, 6) == 'image/') {
+            if (substr($type, 0, 6) == 'image/') {
                 $class = '\\phorkie\\Renderer_Image';
             }
         }
@@ -92,10 +95,10 @@ class File
     /**
      * Get a link to the file
      *
-     * @param string $type Link type. Supported are:
-     *                     - "raw"
-     *                     - "tool"
-     * @param string $option
+     * @param string $type   Link type. Supported are:
+     *                       - "raw"
+     *                       - "tool"
+     * @param string $option Additional option, e.g. tool name
      *
      * @return string
      */
@@ -109,11 +112,16 @@ class File
                     . '/' . $this->getFilename();
             }
         } else if ($type == 'tool') {
-            return '/' . $this->repo->id . '/tool/' . $option . '/' . $this->getFilename();
+            return '/' . $this->repo->id
+                . '/tool/' . $option
+                . '/' . $this->getFilename();
         }
         throw new Exception('Unknown type');
     }
 
+    /**
+     * @return string Mime type of file
+     */
     public function getMimeType()
     {
         $ext = $this->getExt();
@@ -144,13 +152,21 @@ class File
     public function isText()
     {
         $ext = $this->getExt();
+        if ($ext == '') {
+            //no file extension? then consider the size
+            $size = filesize($this->getFullPath());
+            //files <= 4kiB are considered to be text
+            return $size <= 4096;
+        }
+
         if (!isset($GLOBALS['phorkie']['languages'][$ext]['mime'])) {
             return false;
         }
 
         $type = $GLOBALS['phorkie']['languages'][$ext]['mime'];
-        return substr($type, 0, 5) === 'text/';
+        return substr($type, 0, 5) === 'text/'
+            || $type == 'application/javascript';
     }
 }
 
-?>
\ No newline at end of file
+?>