Skip to content

Commit 87e52f9

Browse files
cyfung1031cyfung1031
authored
♻️ 自订类名修订：File -> FileInfo (#1174)
1 parent da66ff7 commit 87e52f9

15 files changed

Lines changed: 54 additions & 60 deletions

File tree

‎packages/filesystem/baidu/baidu.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { AuthVerify } from "../auth";
22
import type FileSystem from "../filesystem";
3-
import type { File, FileReader, FileWriter } from "../filesystem";
3+
import type { FileInfo, FileReader, FileWriter } from "../filesystem";
44
import { joinPath } from "../utils";
55
import { BaiduFileReader, BaiduFileWriter } from "./rw";
66

@@ -20,7 +20,7 @@ export default class BaiduFileSystem implements FileSystem {
2020
return this.list().then();
2121
}
2222

23-
async open(file: File): Promise<FileReader> {
23+
async open(file: FileInfo): Promise<FileReader> {
2424
// 获取fsid
2525
return new BaiduFileReader(this, file);
2626
}
@@ -126,8 +126,8 @@ export default class BaiduFileSystem implements FileSystem {
126126
});
127127
}
128128

129-
async list(): Promise<File[]> {
130-
const list: File[] = [];
129+
async list(): Promise<FileInfo[]> {
130+
const list: FileInfo[] = [];
131131
let start = 0;
132132
const limit = 200;
133133
// 防御性：限制最大分页轮询次数，避免在 API 异常返回时出现无限循环

‎packages/filesystem/baidu/rw.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import type { File, FileReader, FileWriter } from "../filesystem";
1+
import type { FileInfo, FileReader, FileWriter } from "../filesystem";
22
import { calculateMd5, md5OfText } from "@App/pkg/utils/crypto";
33
import type BaiduFileSystem from "./baidu";
44

55
export class BaiduFileReader implements FileReader {
6-
file: File;
6+
file: FileInfo;
77

88
fs: BaiduFileSystem;
99

10-
constructor(fs: BaiduFileSystem, file: File) {
10+
constructor(fs: BaiduFileSystem, file: FileInfo) {
1111
this.fs = fs;
1212
this.file = file;
1313
}

‎packages/filesystem/dropbox/dropbox.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { AuthVerify } from "../auth";
22
import type FileSystem from "../filesystem";
3-
import type { File, FileReader, FileWriter } from "../filesystem";
3+
import type { FileInfo, FileReader, FileWriter } from "../filesystem";
44
import { joinPath } from "../utils";
55
import { DropboxFileReader, DropboxFileWriter } from "./rw";
66

@@ -24,7 +24,7 @@ export default class DropboxFileSystem implements FileSystem {
2424
return this.list().then();
2525
}
2626

27-
open(file: File): Promise<FileReader> {
27+
open(file: FileInfo): Promise<FileReader> {
2828
return Promise.resolve(new DropboxFileReader(this, file));
2929
}
3030

@@ -138,7 +138,7 @@ export default class DropboxFileSystem implements FileSystem {
138138
this.clearRelatedCache(fullPath);
139139
}
140140

141-
async list(): Promise<File[]> {
141+
async list(): Promise<FileInfo[]> {
142142
let folderPath = this.path;
143143

144144
// Dropbox API 需要空字符串来表示根目录
@@ -162,7 +162,7 @@ export default class DropboxFileSystem implements FileSystem {
162162
throw e;
163163
});
164164

165-
const list: File[] = [];
165+
const list: FileInfo[] = [];
166166

167167
const MAX_ITERATIONS = 100;
168168
let iterationCount = 0;

‎packages/filesystem/dropbox/rw.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import type { File, FileReader, FileWriter } from "../filesystem";
1+
import type { FileInfo, FileReader, FileWriter } from "../filesystem";
22
import { joinPath } from "../utils";
33
import type DropboxFileSystem from "./dropbox";
44

55
export class DropboxFileReader implements FileReader {
6-
file: File;
6+
file: FileInfo;
77

88
fs: DropboxFileSystem;
99

10-
constructor(fs: DropboxFileSystem, file: File) {
10+
constructor(fs: DropboxFileSystem, file: FileInfo) {
1111
this.fs = fs;
1212
this.file = file;
1313
}

‎packages/filesystem/filesystem.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export interface File {
1+
export interface FileInfo {
22
fsid?: number;
33
// 文件名
44
name: string;
@@ -32,7 +32,7 @@ export default interface FileSystem {
3232
// 授权验证
3333
verify(): Promise<void>;
3434
// 打开文件
35-
open(file: File): Promise<FileReader>;
35+
open(file: FileInfo): Promise<FileReader>;
3636
// 打开目录
3737
openDir(path: string): Promise<FileSystem>;
3838
// 创建文件
@@ -42,7 +42,7 @@ export default interface FileSystem {
4242
// 删除文件
4343
delete(path: string): Promise<void>;
4444
// 文件列表
45-
list(): Promise<File[]>;
45+
list(): Promise<FileInfo[]>;
4646
// getDirUrl 获取目录的url
4747
getDirUrl(): Promise<string>;
4848
}

‎packages/filesystem/googledrive/googledrive.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { AuthVerify } from "../auth";
22
import type FileSystem from "../filesystem";
3-
import type { File, FileReader, FileWriter } from "../filesystem";
3+
import type { FileInfo, FileReader, FileWriter } from "../filesystem";
44
import { joinPath } from "../utils";
55
import { GoogleDriveFileReader, GoogleDriveFileWriter } from "./rw";
66

@@ -23,7 +23,7 @@ export default class GoogleDriveFileSystem implements FileSystem {
2323
return this.list().then();
2424
}
2525

26-
open(file: File): Promise<FileReader> {
26+
open(file: FileInfo): Promise<FileReader> {
2727
return Promise.resolve(new GoogleDriveFileReader(this, file));
2828
}
2929

@@ -208,7 +208,7 @@ export default class GoogleDriveFileSystem implements FileSystem {
208208

209209
return parentId;
210210
}
211-
async list(): Promise<File[]> {
211+
async list(): Promise<FileInfo[]> {
212212
let folderId = "appDataFolder";
213213

214214
// 获取当前目录的ID
@@ -221,7 +221,7 @@ export default class GoogleDriveFileSystem implements FileSystem {
221221
}
222222

223223
// 列出目录内容，处理分页
224-
const list: File[] = [];
224+
const list: FileInfo[] = [];
225225
let pageToken: string | undefined = undefined;
226226

227227
const query = `'${folderId}' in parents and trashed=false`;

‎packages/filesystem/googledrive/rw.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import type { File, FileReader, FileWriter } from "../filesystem";
1+
import type { FileInfo, FileReader, FileWriter } from "../filesystem";
22
import { joinPath } from "../utils";
33
import type GoogleDriveFileSystem from "./googledrive";
44

55
export class GoogleDriveFileReader implements FileReader {
6-
file: File;
6+
file: FileInfo;
77

88
fs: GoogleDriveFileSystem;
99

10-
constructor(fs: GoogleDriveFileSystem, file: File) {
10+
constructor(fs: GoogleDriveFileSystem, file: FileInfo) {
1111
this.fs = fs;
1212
this.file = file;
1313
}

‎packages/filesystem/limiter.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type FileSystem from "./filesystem";
2-
import type { File, FileReader, FileWriter } from "./filesystem";
2+
import type { FileInfo, FileReader, FileWriter } from "./filesystem";
33

44
/**
55
* 速率限制器
@@ -86,7 +86,7 @@ export default class LimiterFileSystem implements FileSystem {
8686
return this.limiter.execute(() => this.fs.verify());
8787
}
8888

89-
async open(file: File): Promise<FileReader> {
89+
async open(file: FileInfo): Promise<FileReader> {
9090
return this.limiter.execute(async () => {
9191
const reader = await this.fs.open(file);
9292
return {
@@ -119,7 +119,7 @@ export default class LimiterFileSystem implements FileSystem {
119119
return this.limiter.execute(() => this.fs.delete(path));
120120
}
121121

122-
list(): Promise<File[]> {
122+
list(): Promise<FileInfo[]> {
123123
return this.limiter.execute(() => this.fs.list());
124124
}
125125

‎packages/filesystem/onedrive/onedrive.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { AuthVerify } from "../auth";
2-
import type { File, FileReader, FileWriter } from "../filesystem";
2+
import type { FileInfo, FileReader, FileWriter } from "../filesystem";
33
import type FileSystem from "../filesystem";
44
import { joinPath } from "../utils";
55
import { OneDriveFileReader, OneDriveFileWriter } from "./rw";
@@ -20,7 +20,7 @@ export default class OneDriveFileSystem implements FileSystem {
2020
return this.list().then();
2121
}
2222

23-
async open(file: File): Promise<FileReader> {
23+
async open(file: FileInfo): Promise<FileReader> {
2424
return new OneDriveFileReader(this, file);
2525
}
2626

@@ -118,15 +118,15 @@ export default class OneDriveFileSystem implements FileSystem {
118118
return resp;
119119
}
120120

121-
async list(): Promise<File[]> {
121+
async list(): Promise<FileInfo[]> {
122122
let { path } = this;
123123
if (path === "/") {
124124
path = "";
125125
} else {
126126
path = `:${path}:`;
127127
}
128128

129-
const list: File[] = [];
129+
const list: FileInfo[] = [];
130130
let nextLink: string | undefined = `https://graph.microsoft.com/v1.0/me/drive/special/approot${path}/children`;
131131
let iterationCount = 0;
132132
const MAX_ITERATIONS = 100;

‎packages/filesystem/onedrive/rw.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { calculateMd5, md5OfText } from "@App/pkg/utils/crypto";
2-
import type { File, FileReader, FileWriter } from "../filesystem";
2+
import type { FileInfo, FileReader, FileWriter } from "../filesystem";
33
import { joinPath } from "../utils";
44
import type OneDriveFileSystem from "./onedrive";
55

66
export class OneDriveFileReader implements FileReader {
7-
file: File;
7+
file: FileInfo;
88

99
fs: OneDriveFileSystem;
1010

11-
constructor(fs: OneDriveFileSystem, file: File) {
11+
constructor(fs: OneDriveFileSystem, file: FileInfo) {
1212
this.fs = fs;
1313
this.file = file;
1414
}

0 commit comments

Comments
 (0)