From 7c7f32d9a6597fdc7bea02da0cfd4a843fd32d22 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 23 Oct 2018 05:36:35 +0900 Subject: Refactoring --- src/services/drive/add-file.ts | 7 ++++--- src/services/drive/delete-file.ts | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src/services/drive') diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts index 273b056374..ea5a295e01 100644 --- a/src/services/drive/add-file.ts +++ b/src/services/drive/add-file.ts @@ -17,7 +17,8 @@ import { isLocalUser, IUser, IRemoteUser } from '../../models/user'; import delFile from './delete-file'; import config from '../../config'; import { getDriveFileThumbnailBucket } from '../../models/drive-file-thumbnail'; -import { driveStats, perUserDriveStats } from '../stats'; +import driveChart from '../../chart/drive'; +import perUserDriveChart from '../../chart/per-user-drive'; const log = debug('misskey:drive:add-file'); @@ -399,8 +400,8 @@ export default async function( }); // 統計を更新 - driveStats.update(driveFile, true); - perUserDriveStats.update(driveFile, true); + driveChart.update(driveFile, true); + perUserDriveChart.update(driveFile, true); return driveFile; } diff --git a/src/services/drive/delete-file.ts b/src/services/drive/delete-file.ts index 761a5d6d4f..3e2f42003b 100644 --- a/src/services/drive/delete-file.ts +++ b/src/services/drive/delete-file.ts @@ -2,7 +2,8 @@ import * as Minio from 'minio'; import DriveFile, { DriveFileChunk, IDriveFile } from '../../models/drive-file'; import DriveFileThumbnail, { DriveFileThumbnailChunk } from '../../models/drive-file-thumbnail'; import config from '../../config'; -import { driveStats, perUserDriveStats } from '../stats'; +import driveChart from '../../chart/drive'; +import perUserDriveChart from '../../chart/per-user-drive'; export default async function(file: IDriveFile, isExpired = false) { if (file.metadata.storage == 'minio') { @@ -48,6 +49,6 @@ export default async function(file: IDriveFile, isExpired = false) { //#endregion // 統計を更新 - driveStats.update(file, false); - perUserDriveStats.update(file, false); + driveChart.update(file, false); + perUserDriveChart.update(file, false); } -- cgit v1.2.3-freya