git.cweiske.de
/
phorkie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix crash when renaming file
[phorkie.git]
/
src
/
phorkie
/
Repository
/
Post.php
diff --git
a/src/phorkie/Repository/Post.php
b/src/phorkie/Repository/Post.php
index cf07b73a571590dedf532ef63e6cbdec59ba969b..7a373aaf9005e65343c831700db81d2ef327403f 100644
(file)
--- a/
src/phorkie/Repository/Post.php
+++ b/
src/phorkie/Repository/Post.php
@@
-5,6
+5,16
@@
class Repository_Post
{
public $repo;
{
public $repo;
+ /**
+ * When a new file is created during processing, its name
+ * is stored here for later use.
+ *
+ * @var string
+ */
+ public $newfileName;
+
+
+
public function __construct(Repository $repo = null)
{
$this->repo = $repo;
public function __construct(Repository $repo = null)
{
$this->repo = $repo;
@@
-48,8
+58,8
@@
class Repository_Post
continue;
}
continue;
}
- $orignalName = Tools::sanitizeFilename($arFile['original_name']);
- $name = Tools::sanitizeFilename($arFile['name']);
+ $orig
i
nalName = Tools::sanitizeFilename($arFile['original_name']);
+ $name
= Tools::sanitizeFilename($arFile['name']);
if ($arFile['type'] == '_auto_') {
//FIXME: upload
if ($arFile['type'] == '_auto_') {
//FIXME: upload
@@
-69,34
+79,38
@@
class Repository_Post
$bNew = false;
$bDelete = false;
$bNew = false;
$bDelete = false;
- if (!isset($orig
nalName) || $orig
nalName == '') {
+ if (!isset($orig
inalName) || $origi
nalName == '') {
//new file
$bNew = true;
if (strpos($name, '.') === false) {
//automatically append file extension if none is there
$name .= '.' . $arFile['type'];
}
//new file
$bNew = true;
if (strpos($name, '.') === false) {
//automatically append file extension if none is there
$name .= '.' . $arFile['type'];
}
- } else if (!$this->repo->hasFile($orignalName)) {
+ $this->newfileName = $name;
+ } else if (!$this->repo->hasFile($originalName)) {
//unknown file
//FIXME: Show error message
continue;
} else if (isset($arFile['delete']) && $arFile['delete'] == 1) {
$bDelete = true;
//unknown file
//FIXME: Show error message
continue;
} else if (isset($arFile['delete']) && $arFile['delete'] == 1) {
$bDelete = true;
- } else if ($orignalName != $name) {
+ } else if ($orig
i
nalName != $name) {
if (strpos($name, '/') === false) {
//ignore names with a slash in it, would be new directory
//FIXME: what to do with overwrites?
$vc->getCommand('mv')
if (strpos($name, '/') === false) {
//ignore names with a slash in it, would be new directory
//FIXME: what to do with overwrites?
$vc->getCommand('mv')
- ->addArgument($orignalName)
+ ->addArgument($orig
i
nalName)
->addArgument($name)
->execute();
$bCommit = true;
} else {
->addArgument($name)
->execute();
$bCommit = true;
} else {
- $name = $orignalName;
+ $name = $orig
i
nalName;
}
}
$file = $this->repo->getFileByName($name, false);
}
}
$file = $this->repo->getFileByName($name, false);
+ if ($originalName !== '') {
+ $originalFile = $this->repo->getFileByName($originalName, false);
+ }
if ($bDelete) {
$command = $vc->getCommand('rm')
->addArgument($file->getFilename())
if ($bDelete) {
$command = $vc->getCommand('rm')
->addArgument($file->getFilename())
@@
-112,8
+126,8
@@
class Repository_Post
->execute();
$bCommit = true;
} else if ($bNew
->execute();
$bCommit = true;
} else if ($bNew
- || (isset($arFile['content'])
- && $
f
ile->getContent() != $arFile['content']
+ || (isset($arFile['content'])
&& isset($originalFile)
+ && $
originalF
ile->getContent() != $arFile['content']
)
) {
$dir = dirname($file->getFullPath());
)
) {
$dir = dirname($file->getFullPath());
@@
-152,8
+166,12
@@
class Repository_Post
->setOption('message', "$notes")
->execute();
//update info for dumb git HTTP transport
->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();
$vc->getCommand('update-server-info')->execute();
+ //we changed the hash by committing, so reload it
+ $this->repo->reloadHash();
+
$bChanged = true;
}
$bChanged = true;
}
@@
-231,13
+249,23
@@
class Repository_Post
return $prefix . $num;
}
return $prefix . $num;
}
- public 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);
$type = Tool_MIME_Type_PlainDetect::autoDetect($tmp);
unlink($tmp);
$tmp = tempnam(sys_get_temp_dir(), 'phorkie-autodetect-');
file_put_contents($tmp, $content);
$type = Tool_MIME_Type_PlainDetect::autoDetect($tmp);
unlink($tmp);
+ if ($returnError && $type instanceof \PEAR_Error) {
+ return $type;
+ }
+
return $this->findExtForType($type);
}
return $this->findExtForType($type);
}