From e37840d870eec41599cde71baee70e3688e21f32 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sat, 4 Jan 2020 07:20:41 +0900
Subject: ドライブ関連の修正 (#5673)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* :v:

* Update add-file.ts

* fix
---
 src/services/drive/add-file.ts         | 26 ++++++++++++++++++--------
 src/services/drive/image-processor.ts  |  1 -
 src/services/drive/internal-storage.ts | 12 +++++++-----
 3 files changed, 25 insertions(+), 14 deletions(-)

(limited to 'src/services/drive')

diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts
index 54aa018a46..350e4dfe19 100644
--- a/src/services/drive/add-file.ts
+++ b/src/services/drive/add-file.ts
@@ -159,6 +159,8 @@ export async function generateAlts(path: string, type: string, generateWeb: bool
 				webpublic = await convertToWebp(path, 2048, 2048);
 			} else if (['image/png'].includes(type)) {
 				webpublic = await convertToPng(path, 2048, 2048);
+			} else {
+				logger.debug(`web image not created (not an required image)`);
 			}
 		} catch (e) {
 			logger.warn(`web image not created (an error occured)`, e);
@@ -180,8 +182,10 @@ export async function generateAlts(path: string, type: string, generateWeb: bool
 			try {
 				thumbnail = await GenerateVideoThumbnail(path);
 			} catch (e) {
-				logger.error(`GenerateVideoThumbnail failed: ${e}`);
+				logger.warn(`GenerateVideoThumbnail failed: ${e}`);
 			}
+		} else {
+			logger.debug(`thumbnail not created (not an required file)`);
 		}
 	} catch (e) {
 		logger.warn(`thumbnail not created (an error occured)`, e);
@@ -351,7 +355,7 @@ export default async function(
 
 	let propPromises: Promise<void>[] = [];
 
-	const isImage = ['image/jpeg', 'image/gif', 'image/png', 'image/apng', 'image/vnd.mozilla.apng', 'image/webp'].includes(mime);
+	const isImage = ['image/jpeg', 'image/gif', 'image/png', 'image/apng', 'image/vnd.mozilla.apng', 'image/webp', 'image/svg+xml'].includes(mime);
 
 	if (isImage) {
 		const img = sharp(path);
@@ -374,15 +378,21 @@ export default async function(
 			logger.debug('calculating average color...');
 
 			try {
-				const info = await (img as any).stats();
+				const info = await img.stats();
+
+				if (info.isOpaque) {
+					const r = Math.round(info.channels[0].mean);
+					const g = Math.round(info.channels[1].mean);
+					const b = Math.round(info.channels[2].mean);
 
-				const r = Math.round(info.channels[0].mean);
-				const g = Math.round(info.channels[1].mean);
-				const b = Math.round(info.channels[2].mean);
+					logger.debug(`average color is calculated: ${r}, ${g}, ${b}`);
 
-				logger.debug(`average color is calculated: ${r}, ${g}, ${b}`);
+					properties['avgColor'] = `rgb(${r},${g},${b})`;
+				} else {
+					logger.debug(`this image is not opaque so average color is 255, 255, 255`);
 
-				properties['avgColor'] = `rgb(${r},${g},${b})`;
+					properties['avgColor'] = `rgb(255,255,255)`;
+				}
 			} catch (e) { }
 		};
 
diff --git a/src/services/drive/image-processor.ts b/src/services/drive/image-processor.ts
index e2dd90cfa0..21a05fa9e4 100644
--- a/src/services/drive/image-processor.ts
+++ b/src/services/drive/image-processor.ts
@@ -1,5 +1,4 @@
 import * as sharp from 'sharp';
-import * as fs from 'fs';
 
 export type IImage = {
 	data: Buffer;
diff --git a/src/services/drive/internal-storage.ts b/src/services/drive/internal-storage.ts
index ff890d7d47..f8d7489a22 100644
--- a/src/services/drive/internal-storage.ts
+++ b/src/services/drive/internal-storage.ts
@@ -3,25 +3,27 @@ import * as Path from 'path';
 import config from '../../config';
 
 export class InternalStorage {
-	private static readonly path = Path.resolve(`${__dirname}/../../../files`);
+	private static readonly path = Path.resolve(__dirname, '../../../files');
+
+	public static resolvePath = (key: string) => Path.resolve(InternalStorage.path, key);
 
 	public static read(key: string) {
-		return fs.createReadStream(`${InternalStorage.path}/${key}`);
+		return fs.createReadStream(InternalStorage.resolvePath(key));
 	}
 
 	public static saveFromPath(key: string, srcPath: string) {
 		fs.mkdirSync(InternalStorage.path, { recursive: true });
-		fs.copyFileSync(srcPath, `${InternalStorage.path}/${key}`);
+		fs.copyFileSync(srcPath, InternalStorage.resolvePath(key));
 		return `${config.url}/files/${key}`;
 	}
 
 	public static saveFromBuffer(key: string, data: Buffer) {
 		fs.mkdirSync(InternalStorage.path, { recursive: true });
-		fs.writeFileSync(`${InternalStorage.path}/${key}`, data);
+		fs.writeFileSync(InternalStorage.resolvePath(key), data);
 		return `${config.url}/files/${key}`;
 	}
 
 	public static del(key: string) {
-		fs.unlink(`${InternalStorage.path}/${key}`, () => {});
+		fs.unlink(InternalStorage.resolvePath(key), () => {});
 	}
 }
-- 
cgit v1.2.3-freya