james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changes and bugfixes for bulk import extension

Browse Source
This commit is contained in:
Matthew Barbour 2020-06-16 18:31:33 -05:00 committed by Shish
parent 30f62c2ff8
commit ea34d9b756
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ext/bulk_import_export/main.php
View File

@ -31,6 +31,7 @@ class BulkImportExport extends DataHandlerExtension
} }
$total = 0; $total = 0;
$skipped = 0; $skipped = 0;
$failed = 0;
$database->commit(); $database->commit();
@ -46,7 +47,7 @@ class BulkImportExport extends DataHandlerExtension
continue; continue;
} }
$tmpfile = tempnam("/tmp", "shimmie_bulk_import"); $tmpfile = tempnam(sys_get_temp_dir(), "shimmie_bulk_import");
$stream = $zip->getStream($item->hash); $stream = $zip->getStream($item->hash);
if ($zip === false) { if ($zip === false) {
throw new SCoreException("Could not import " . $item->hash . ": File not in zip"); throw new SCoreException("Could not import " . $item->hash . ": File not in zip");
@ -74,6 +75,7 @@ class BulkImportExport extends DataHandlerExtension
$database->commit(); $database->commit();
$total++; $total++;
} catch (Exception $ex) { } catch (Exception $ex) {
$failed++;
try { try {
$database->rollBack(); $database->rollBack();
} catch (Exception $ex2) { } catch (Exception $ex2) {
@ -89,7 +91,11 @@ class BulkImportExport extends DataHandlerExtension
} }
$event->image_id = -2; // default -1 = upload wasn't handled $event->image_id = -2; // default -1 = upload wasn't handled
log_info(BulkImportExportInfo::KEY, "Imported $total items, skipped $skipped", "Imported $total items, skipped $skipped"); log_info(
BulkImportExportInfo::KEY,
"Imported $total items, skipped $skipped, $failed failed",
"Imported $total items, skipped $skipped, $failed failed"
);
} else { } else {
throw new SCoreException("Could not open zip archive"); throw new SCoreException("Could not open zip archive");
} }
@ -113,7 +119,8 @@ class BulkImportExport extends DataHandlerExtension
if ($user->can(Permissions::BULK_EXPORT) && if ($user->can(Permissions::BULK_EXPORT) &&
($event->action == self::EXPORT_ACTION_NAME)) { ($event->action == self::EXPORT_ACTION_NAME)) {
$zip_filename = data_path($user->name . '-' . date('YmdHis') . '.zip'); $download_filename = $user->name . '-' . date('YmdHis') . '.zip';
$zip_filename = tempnam(sys_get_temp_dir(), "shimmie_bulk_export");
$zip = new ZipArchive; $zip = new ZipArchive;
$json_data = []; $json_data = [];
@ -142,7 +149,9 @@ class BulkImportExport extends DataHandlerExtension
$page->set_mode(PageMode::FILE); $page->set_mode(PageMode::FILE);
$page->set_file($zip_filename, true); $page->set_file($zip_filename, true);
$page->set_filename(basename($zip_filename)); $page->set_filename($download_filename);
$event->redirect = false;
} }
} }
} }