make mime type detection work on php-fpm which has no PATH env variable

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

diff --git a/src/phorkie/Repository/Post.php b/src/phorkie/Repository/Post.php
index 1a30b476dcecb30a203be2c78dafcfa2341e817b..a61f2a257e6f78709e49489bce9a1f4dfa063ba5 100644 (file)
--- a/src/phorkie/Repository/Post.php
+++ b/src/phorkie/Repository/Post.php
@@ -116,6 +116,10 @@ class Repository_Post
                     && $file->getContent() != $arFile['content']
                 )
             ) {
                     && $file->getContent() != $arFile['content']
                 )
             ) {

+                $dir = dirname($file->getFullPath());
+                if (!is_dir($dir)) {
+                    mkdir($dir, 0777, true);
+                }

                 file_put_contents($file->getFullPath(), $arFile['content']);
                 $command = $vc->getCommand('add')
                     ->addArgument($file->getFilename())
                 file_put_contents($file->getFullPath(), $arFile['content']);
                 $command = $vc->getCommand('add')
                     ->addArgument($file->getFilename())


@@ -134,6 +138,7 @@ class Repository_Post
             $vc->getCommand('commit')
                 ->setOption('message', '')
                 ->setOption('allow-empty-message')
             $vc->getCommand('commit')
                 ->setOption('message', '')
                 ->setOption('allow-empty-message')

+                ->setOption('no-edit')

                 ->setOption(
                     'author',
                     $sessionData['name'] . ' <' . $sessionData['email'] . '>'
                 ->setOption(
                     'author',
                     $sessionData['name'] . ' <' . $sessionData['email'] . '>'


@@ -146,6 +151,10 @@ class Repository_Post
                 ->setOption('force')
                 ->setOption('message', "$notes")
                 ->execute();
                 ->setOption('force')
                 ->setOption('message', "$notes")
                 ->execute();

+            //update info for dumb git HTTP transport
+            //the post-update hook should do that IMO, but does not somehow
+            $vc->getCommand('update-server-info')->execute();
+

             $bChanged = true;
         }
 
             $bChanged = true;
         }
 


@@ -153,10 +162,18 @@ class Repository_Post
             //FIXME: index changed files only
             //also handle file deletions
             $db = new Database();
             //FIXME: index changed files only
             //also handle file deletions
             $db = new Database();

+            $not = new Notificator();

             if ($bNew) {
                 $db->getIndexer()->addRepo($this->repo);
             if ($bNew) {
                 $db->getIndexer()->addRepo($this->repo);

+                $not->create($this->repo);

             } else {
             } else {

-                $db->getIndexer()->updateRepo($this->repo);
+                $commits = $this->repo->getHistory();
+                $db->getIndexer()->updateRepo(
+                    $this->repo,
+                    $commits[count($commits)-1]->committerTime,
+                    $commits[0]->committerTime
+                );
+                $not->edit($this->repo);

             }
         }
 
             }
         }
 


@@ -169,7 +186,15 @@ class Repository_Post
             if ($_FILES['files']['error'][$num]['upload'] == 0) {
                 return true;
             }
             if ($_FILES['files']['error'][$num]['upload'] == 0) {
                 return true;
             }

-            if ($arFile['content'] != '') {
+            if (isset($arFile['content']) && $arFile['content'] != '') {
+                return true;
+            }
+            if (isset($arFile['name']) && $arFile['name'] != '') {
+                //binary files do not have content
+                return true;
+            }
+            if (isset($arFile['delete']) && $arFile['delete'] != '') {
+                //binary files do not have content

                 return true;
             }
         }
                 return true;
             }
         }


@@ -190,11 +215,8 @@ class Repository_Post
             ->addArgument($repo->workDir)
             ->execute();
 
             ->addArgument($repo->workDir)
             ->execute();
 

-        foreach (glob($repo->gitDir . '/hooks/*') as $hookfile) {
-            unlink($hookfile);
-        }
-
-        touch($repo->gitDir . '/git-daemon-export-ok');
+        $rs = new Repository_Setup($repo);
+        $rs->afterInit();

 
         return $repo;
     }
 
         return $repo;
     }


@@ -210,13 +232,23 @@ class Repository_Post
         return $prefix . $num;
     }
 
         return $prefix . $num;
     }
 

-    protected function getType($content)
+    public function getType($content, $returnError = false)

     {
     {

+        if (getenv('PATH') == '') {
+            //php-fpm does not fill $PATH by default
+            // we have to work around that since System::which() uses it
+            putenv('PATH=/usr/local/bin:/usr/bin:/bin');
+        }
+

         $tmp = tempnam(sys_get_temp_dir(), 'phorkie-autodetect-');
         file_put_contents($tmp, $content);
         $tmp = tempnam(sys_get_temp_dir(), 'phorkie-autodetect-');
         file_put_contents($tmp, $content);

-        $type = \MIME_Type_PlainDetect::autoDetect($tmp);
+        $type = Tool_MIME_Type_PlainDetect::autoDetect($tmp);

         unlink($tmp);
 
         unlink($tmp);
 

+        if ($returnError && $type instanceof \PEAR_Error) {
+            return $type;
+        }
+

         return $this->findExtForType($type);
     }
 
         return $this->findExtForType($type);
     }