diff options
author | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-08-11 10:39:03 +0200 |
---|---|---|
committer | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-08-11 10:39:03 +0200 |
commit | b89d2d7580e40cd417defaffd2514b5eed38577d (patch) | |
tree | 78ba9004d87b994dd9a531b475fd51b940bf3dd8 /util/storageconv | |
parent | 350e636e3d0a44323c69185555e89cc01a213aa2 (diff) | |
parent | 047dd31724f8da12c153b4a6f27dc5462f7b97e5 (diff) | |
download | volse-hubzilla-b89d2d7580e40cd417defaffd2514b5eed38577d.tar.gz volse-hubzilla-b89d2d7580e40cd417defaffd2514b5eed38577d.tar.bz2 volse-hubzilla-b89d2d7580e40cd417defaffd2514b5eed38577d.zip |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'util/storageconv')
-rwxr-xr-x | util/storageconv | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/util/storageconv b/util/storageconv index 9c49787d1..992c906b8 100755 --- a/util/storageconv +++ b/util/storageconv @@ -45,8 +45,8 @@ if($argc == 2) { break; } - $x = q("SELECT DISTINCT resource_id, content FROM photo WHERE photo_usage = 0 AND os_storage = 1 AND imgscale = 0"); - + $x = q("SELECT resource_id, content FROM photo WHERE photo_usage = 0 AND os_storage = 1 AND imgscale = 0"); + if($x) { foreach($x as $xx) { @@ -54,12 +54,15 @@ if($argc == 2) { dbesc($xx['resource_id']), $storage ); + + $img_path = dbunescbin($xx['content']); foreach($n as $nn) { echo '.'; - $filename = dbunescbin($xx['content']) . '-' . $nn['imgscale']; + $filename = $img_path . '-' . $nn['imgscale']; + if(! file_put_contents($filename, dbunescbin($nn['content']))) { echo 'Failed to save file ' . $filename . PHP_EOL; continue; @@ -85,7 +88,7 @@ if($argc == 2) { break; } - $x = q("SELECT DISTINCT resource_id FROM photo WHERE photo_usage = 0 AND os_storage = 1 AND imgscale = 0"); + $x = q("SELECT resource_id FROM photo WHERE photo_usage = 0 AND os_storage = 1 AND imgscale = 0"); if($x) { foreach($x as $xx) { |