Updated all dependencies. Updated MindGeek to Aylo.
This commit is contained in:
29
src/media.js
29
src/media.js
@@ -14,7 +14,9 @@ const ffmpeg = require('fluent-ffmpeg');
|
||||
const sharp = require('sharp');
|
||||
const blake2 = require('blake2');
|
||||
const taskQueue = require('promise-task-queue');
|
||||
const AWS = require('aws-sdk');
|
||||
|
||||
const { Upload } = require('@aws-sdk/lib-storage');
|
||||
const { S3Client } = require('@aws-sdk/client-s3');
|
||||
|
||||
const logger = require('./logger')(__filename);
|
||||
const argv = require('./argv');
|
||||
@@ -27,11 +29,9 @@ const { get } = require('./utils/qu');
|
||||
// const pipeline = util.promisify(stream.pipeline);
|
||||
const streamQueue = taskQueue();
|
||||
|
||||
const endpoint = new AWS.Endpoint('s3.eu-central-1.wasabisys.com');
|
||||
|
||||
const s3 = new AWS.S3({
|
||||
// region: 'eu-central-1',
|
||||
endpoint,
|
||||
const s3 = new S3Client({
|
||||
region: 'eu-central-1',
|
||||
endpoint: 'https://s3.eu-central-1.wasabisys.com',
|
||||
credentials: {
|
||||
accessKeyId: config.s3.accessKey,
|
||||
secretAccessKey: config.s3.secretKey,
|
||||
@@ -391,12 +391,15 @@ async function storeS3Object(filepath, media) {
|
||||
const fullFilepath = path.join(config.media.path, filepath);
|
||||
const file = fs.createReadStream(fullFilepath);
|
||||
|
||||
const status = await s3.upload({
|
||||
Bucket: config.s3.bucket,
|
||||
Body: file,
|
||||
Key: filepath,
|
||||
ContentType: media.meta.mimetype,
|
||||
}).promise();
|
||||
const status = await new Upload({
|
||||
client: s3,
|
||||
params: {
|
||||
Bucket: config.s3.bucket,
|
||||
Body: file,
|
||||
Key: filepath,
|
||||
ContentType: media.meta.mimetype,
|
||||
},
|
||||
}).done();
|
||||
|
||||
await fsPromises.unlink(fullFilepath);
|
||||
|
||||
@@ -992,7 +995,7 @@ async function deleteS3Objects(media) {
|
||||
Objects: objects,
|
||||
Quiet: false,
|
||||
},
|
||||
}).promise();
|
||||
});
|
||||
|
||||
logger.info(`Removed ${status.Deleted.length} media files from S3 bucket '${config.s3.bucket}', ${status.Errors.length} errors`);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user