sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[noImplicitAny: true] src/services/drive

Browse Source
This commit is contained in:
rinsuki
2018-06-17 20:04:19 +09:00
parent 9d65415fdc
commit daa409cd82
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/services/drive/add-file.ts
View File

@ -7,7 +7,7 @@ import * as crypto from 'crypto';
import * as _gm from 'gm';
import * as debug from 'debug';
import fileType = require('file-type');
import prominence = require('prominence');
const prominence = require('prominence');
import DriveFile, { IMetadata, getDriveFileBucket, IDriveFile } from '../../models/drive-file';
import DriveFolder from '../../models/drive-folder';
@ -33,7 +33,7 @@ const writeChunks = (name: string, readable: stream.Readable, type: string, meta
readable.pipe(writeStream);
}));
const writeThumbnailChunks = (name: string, readable: stream.Readable, originalId) =>
const writeThumbnailChunks = (name: string, readable: stream.Readable, originalId: mongodb.ObjectID) =>
getDriveFileThumbnailBucket()
.then(bucket => new Promise((resolve, reject) => {
const writeStream = bucket.openUploadStream(name, {
@ -89,7 +89,7 @@ export default async function(
const calcHash = new Promise<string>((res, rej) => {
const readable = fs.createReadStream(path);
const hash = crypto.createHash('md5');
const chunks = [];
const chunks: Buffer[] = [];
readable
.on('error', rej)
.pipe(hash)
@ -201,7 +201,7 @@ export default async function(
return driveFolder;
};
const properties = {};
const properties: {[key: string]: any} = {};
let propPromises: Array<Promise<void>> = [];

4
src/services/drive/upload-from-url.ts
View File

@ -8,10 +8,12 @@ import * as request from 'request';
import { IDriveFile, validateFileName } from '../../models/drive-file';
import create from './add-file';
import config from '../../config';
import { IUser } from '../../models/user';
import * as mongodb from "mongodb";
const log = debug('misskey:drive:upload-from-url');
export default async (url: string, user, folderId = null, uri: string = null): Promise<IDriveFile> => {
export default async (url: string, user: IUser, folderId: mongodb.ObjectID = null, uri: string = null): Promise<IDriveFile> => {
log(`REQUESTED: ${url}`);
let name = URL.parse(url).pathname.split('/').pop();