aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2021-09-29 23:01:27 +0200
committerMax Kostikov <max@kostikov.co>2021-09-29 23:01:27 +0200
commit9a19f7eac921bb5d05477cef98b2c2c200049c6c (patch)
tree85f33490972f5f27a651bccdf358128afc77bda6
parent817237ef77464ae1b1f8698569236d7c24bd8682 (diff)
downloadvolse-hubzilla-9a19f7eac921bb5d05477cef98b2c2c200049c6c.tar.gz
volse-hubzilla-9a19f7eac921bb5d05477cef98b2c2c200049c6c.tar.bz2
volse-hubzilla-9a19f7eac921bb5d05477cef98b2c2c200049c6c.zip
Fix possible storage conversion stuck on file save error
-rwxr-xr-xutil/storageconv19
1 files changed, 10 insertions, 9 deletions
diff --git a/util/storageconv b/util/storageconv
index 52bb77fbb..676425038 100755
--- a/util/storageconv
+++ b/util/storageconv
@@ -77,17 +77,18 @@ if($argc == 2) {
}
if(! file_put_contents($filename, dbunescbin($xx['content']))) {
+ @unlink($filename);
echo PHP_EOL . 'Failed to save file ' . $filename . PHP_EOL;
- continue;
}
-
- $z = q("UPDATE photo SET content = '%s', os_storage = 1 WHERE id = %d",
- dbescbin($filename),
- intval($xx['id'])
- );
- if(! $z) {
- @unlink($filename);
- echo PHP_EOL . 'Failed to update metadata for saved file ' . $filename . PHP_EOL;
+ else {
+ $z = q("UPDATE photo SET content = '%s', os_storage = 1 WHERE id = %d",
+ dbescbin($filename),
+ intval($xx['id'])
+ );
+ if(! $z) {
+ @unlink($filename);
+ echo PHP_EOL . 'Failed to update metadata for saved file ' . $filename . PHP_EOL;
+ }
}
$cur_id = $xx['id'];