badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #654 from sanmadjack/develop

Browse source 
Cron upload changes
This commit is contained in:
Shish 2019-06-03 07:39:55 +01:00 committed by GitHub
commit abeb6299fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/util.php
View file

@ -281,14 +281,20 @@ function manual_include(string $fname): ?string
function path_to_tags(string $path): string function path_to_tags(string $path): string
{ {
$matches = []; $matches = [];
if (preg_match("/\d+ - (.*)\.([a-zA-Z]+)/", basename($path), $matches)) { $tags = "";
if(preg_match("/\d+ - (.*)\.([a-zA-Z0-9]+)/", basename($path), $matches)) {
$tags = $matches[1]; $tags = $matches[1];
} else {
$tags = dirname($path);
$tags = str_replace("/", " ", $tags);
$tags = str_replace("__", " ", $tags);
$tags = trim($tags);
} }
$dir_tags = dirname($path);
$dir_tags = str_replace("/", " ", $dir_tags);
$dir_tags = str_replace("__", " ", $dir_tags);
$dir_tags = trim($dir_tags);
if ($dir_tags != "") {
$tags = trim($tags)." ".trim($dir_tags);
}
$tags = trim ( $tags );
return $tags; return $tags;
} }

18
ext/cron_uploader/main.php
View file

@ -273,6 +273,11 @@ class CronUploader extends Extension
$this->move_uploaded($img[0], $img[1], false); $this->move_uploaded($img[0], $img[1], false);
} catch (Exception $e) { } catch (Exception $e) {
$this->move_uploaded($img[0], $img[1], true); $this->move_uploaded($img[0], $img[1], true);
if (strpos($e->getMessage(), 'SQLSTATE') !== false) {
// Postgres invalidates the transaction if there is an SQL error,
// so all subsequence transactions will fail.
break;
}
} }
} }
@ -289,15 +294,22 @@ class CronUploader extends Extension
// Create // Create
$newDir = $this->root_dir; $newDir = $this->root_dir;
$relativeDir = dirname(substr($path, strlen($this->root_dir) + 7));
// Determine which dir to move to // Determine which dir to move to
if ($corrupt) { if ($corrupt) {
// Move to corrupt dir // Move to corrupt dir
$newDir .= "/failed_to_upload/"; $newDir .= "/failed_to_upload/".$relativeDir;
$info = "ERROR: Image was not uploaded."; $info = "ERROR: Image was not uploaded.";
} else { }
$newDir .= "/uploaded/"; else {
$newDir .= "/uploaded/".$relativeDir;
$info = "Image successfully uploaded. "; $info = "Image successfully uploaded. ";
} }
$newDir = str_replace ( "//", "/", $newDir."/" );
if (!is_dir($newDir))
mkdir ( $newDir, 0775, true );
// move file to correct dir // move file to correct dir
rename($path, $newDir.$filename); rename($path, $newDir.$filename);