arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Continue url-import even when an error occurs

Browse Source
This commit is contained in:
Tobias Reich 2014-04-26 21:02:50 +02:00
parent d0368ea651
commit 5d7328613d
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
php/modules/Import.php
View File

@ -30,25 +30,31 @@ class Import extends Module {
static function url($urls, $albumID = 0) { static function url($urls, $albumID = 0) {
$error = false;
# Parse # Parse
$urls = str_replace(' ', '%20', $urls); $urls = str_replace(' ', '%20', $urls);
$urls = explode(',', $urls); $urls = explode(',', $urls);
foreach ($urls as &$url) { foreach ($urls as &$url) {
if (@exif_imagetype($url)!==false) { if (@exif_imagetype($url)===false) {
$error = true;
continue;
}
$pathinfo = pathinfo($url); $pathinfo = pathinfo($url);
$filename = $pathinfo['filename'] . '.' . $pathinfo['extension']; $filename = $pathinfo['filename'] . '.' . $pathinfo['extension'];
$tmp_name = LYCHEE_DATA . $filename; $tmp_name = LYCHEE_DATA . $filename;
if (!@copy($url, $tmp_name)) return false; if (@copy($url, $tmp_name)===false) $error = true;
} }
} $import = Import::server($albumID, LYCHEE_DATA);
return Import::server($albumID, LYCHEE_DATA); if ($error===false&&$import===true) return true;
else return false;
} }