USEFULL
/
qw-gallery-scenery
mirror of https://github.com/qwertyforce/scenery.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove move

pull/9/head
qwertyforce 2023-03-06 17:10:53 +03:00
parent f5d71c34bc
commit c9251f7b1c
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/bulk_import_images/bulk_import_images.ts
View File

@ -12,8 +12,6 @@ console.log(process.argv.slice(2))
for (const arg of process.argv.slice(2)){
if(arg === "--use_filename_id"){
myArgs["use_filename_id"]=true
}else if(arg === "--move"){
myArgs["move"]=true
}else if (arg.startsWith("--path=")){
PATH_TO_IMAGE_IMPORT=path.resolve(arg.slice(arg.indexOf("--path=")+7))
console.log(PATH_TO_IMAGE_IMPORT)
@ -38,7 +36,7 @@ async function import_images() {
console.log(`id: ${img_id} is already in db`)
break
}
const img_data = await image_ops.import_image(img_buffer, [], "", myArgs["bypass_ambience"], img_id, myArgs["move"]?img_path:"")
const img_data = await image_ops.import_image(img_buffer, [], "", myArgs["bypass_ambience"], img_id)
console.log(img_data)
// fsPromises.unlink(img_path)
}

8
src/server/helpers/image_ops.ts
View File

@ -206,7 +206,7 @@ function parse_author(tags: string[]) { //tags like "artist:shishkin"
return "???"
}
async function import_image(image_buffer: Buffer, tags: string[] = [], source_url = "", bypass_checks = false, img_id=-1,move_path="") {
async function import_image(image_buffer: Buffer, tags: string[] = [], source_url = "", bypass_checks = false, img_id=-1) {
try {
const sha256_hash = crypto_ops.image_buffer_sha256_hash(image_buffer)
const found_img = await db_ops.image_ops.find_image_by_sha256(sha256_hash)
@ -258,11 +258,7 @@ async function import_image(image_buffer: Buffer, tags: string[] = [], source_ur
const new_image_id = img_id === -1 ? (await db_ops.image_ops.get_max_image_id()) + 1 : img_id
await db_ops.image_ops.add_image({ id: new_image_id, caption, source_url, file_ext, width, height, author, size, tags: [...new Set(tags)], sha256: sha256_hash, created_at: new Date() })
if (move_path){
await fs.rename(move_path, `${PATH_TO_IMAGES}/${new_image_id}.${file_ext}`)
}else{
await fs.writeFile(`${PATH_TO_IMAGES}/${new_image_id}.${file_ext}`, image_buffer, 'binary')
}
await fs.writeFile(`${PATH_TO_IMAGES}/${new_image_id}.${file_ext}`, image_buffer, 'binary')
await fs.writeFile(`${PATH_TO_THUMBNAILS}/${new_image_id}.jpg`, thumbnail_buffer, 'binary')
if(!bypass_checks){
const res = await calculate_all_image_features(new_image_id, image_buffer)