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

Added skipped count to bulk import

Browse Source
This commit is contained in:
Matthew Barbour 2020-06-04 09:48:43 -05:00 committed by Shish
parent 1fdd5bf575
commit dd08b936e3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext/bulk_import_export/main.php
View File

@ -30,11 +30,14 @@ class BulkImportExport extends DataHandlerExtension
throw new SCoreException("Could not get " . self::EXPORT_INFO_FILE_NAME . " from archive"); throw new SCoreException("Could not get " . self::EXPORT_INFO_FILE_NAME . " from archive");
} }
$total = 0; $total = 0;
$skipped = 0;
while (!empty($json_data)) { while (!empty($json_data)) {
$item = array_pop($json_data); $item = array_pop($json_data);
$image = Image::by_hash($item->hash); $image = Image::by_hash($item->hash);
if ($image!=null) { if ($image!=null) {
$skipped++;
log_info("BulkImportExport", "Image $item->hash already present, skipping");
continue; continue;
} }
@ -78,7 +81,7 @@ 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("BulkImportExport", "Imported " . $total . " items", "Imported " . $total . " items"); log_info("BulkImportExport", "Imported $total items, skipped $skipped", "Imported $total items, skipped $skipped");
} else { } else {
throw new SCoreException("Could not open zip archive"); throw new SCoreException("Could not open zip archive");
} }