Skip to content

Commit 82e23d6

Browse files
authored
[PB-1933] fix: show only overriden file as uploaded (#478)
1 parent 83a2cea commit 82e23d6

3 files changed

Lines changed: 17 additions & 7 deletions

File tree

src/apps/fuse/callbacks/UploadOnRename.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,11 @@ export class UploadOnRename {
7272
await this.offline.offlineContentsUploader.run(
7373
offlineFile.id,
7474
offlineFile.path,
75-
fileToOverride.contentsId
75+
{
76+
contentsId: fileToOverride.contentsId,
77+
name: fileToOverride.name,
78+
extension: fileToOverride.type,
79+
}
7680
);
7781

7882
return right(UploadOnRename.SUCCESS);

src/context/offline-drive/contents/application/OfflineContentsUploader.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ import { FilePath } from '../../../virtual-drive/files/domain/FilePath';
66
import { OfflineContentsName } from '../domain/OfflineContentsName';
77
import Logger from 'electron-log';
88

9+
interface Replaces {
10+
contentsId: string;
11+
name: string;
12+
extension: string;
13+
}
14+
915
export class OfflineContentsUploader {
1016
constructor(
1117
private readonly repository: OfflineContentsRepository,
@@ -16,7 +22,7 @@ export class OfflineContentsUploader {
1622
async run(
1723
name: OfflineContentsName,
1824
path: FilePath,
19-
replaces?: string
25+
replaces?: Replaces
2026
): Promise<string> {
2127
const { contents, stream, abortSignal } =
2228
await this.repository.createStream(name);
@@ -25,8 +31,8 @@ export class OfflineContentsUploader {
2531
stream,
2632
contents,
2733
{
28-
name: path.name(),
29-
extension: path.extension(),
34+
name: replaces?.name || path.name(),
35+
extension: replaces?.extension || path.extension(),
3036
},
3137
abortSignal
3238
);
@@ -40,7 +46,7 @@ export class OfflineContentsUploader {
4046
offlineContentsPath: contents.absolutePath,
4147
size: contents.size,
4248
path: path.value,
43-
replaces,
49+
replaces: replaces?.contentsId,
4450
});
4551

4652
await this.eventBus.publish([contentsUploadedEvent]);

src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import fs, { closeSync, createReadStream, readSync, unlink, watch } from 'fs';
1+
import fs, { createReadStream, unlink, watch } from 'fs';
22
import { readFile, stat as statPromises } from 'fs/promises';
33
import { OfflineContentsRepository } from '../domain/OfflineContentsRepository';
44
import { OfflineFile } from '../../files/domain/OfflineFile';
55
import { LocalFileContentsDirectoryProvider } from '../../../virtual-drive/shared/domain/LocalFileContentsDirectoryProvider';
66
import { basename, dirname, join } from 'path';
77
import Logger from 'electron-log';
8-
import { Readable, Stream } from 'stream';
8+
import { Readable } from 'stream';
99
import { OfflineContents } from '../domain/OfflineContents';
1010
import { OfflineContentsName } from '../domain/OfflineContentsName';
1111
import { OfflineFileId } from '../../files/domain/OfflineFileId';

0 commit comments

Comments
 (0)