refactor(files.service): move getfolderSize method to father class

Author: zaldih

src/interfaces/file-service.interface.ts

@@ -1,7 +1,9 @@
+import { FileWorkerService } from 'src/services/index.js';
 import { IListDirParams } from '../interfaces/list-dir-params.interface.js';
 import { Observable } from 'rxjs';
 
 export interface IFileService {
+  fileWorkerService: FileWorkerService;
   getFolderSize: (path: string) => Observable<number>;
   listDir: (params: IListDirParams) => Observable<string>;
   deleteDir: (path: string) => Promise<boolean>;

src/services/files/files.service.ts

@@ -5,12 +5,24 @@ import {
   IListDirParams,
 } from '../../interfaces/index.js';
 import { readdir, stat } from 'fs/promises';
-import { Observable } from 'rxjs';
+import { map, Observable, Subject } from 'rxjs';
+import { FileWorkerService } from './files.worker.service.js';
 
 export abstract class FileService implements IFileService {
+  public fileWorkerService: FileWorkerService;
+
+  constructor(fileWorkerService: FileWorkerService) {
+    this.fileWorkerService = fileWorkerService;
+  }
+
   abstract listDir(params: IListDirParams): Observable<string>;
   abstract deleteDir(path: string): Promise<boolean>;
-  abstract getFolderSize(path: string): Observable<number>;
+
+  getFolderSize(path: string): Observable<number> {
+    const stream$ = new Subject<number>();
+    this.fileWorkerService.getFolderSize(stream$, path);
+    return stream$.pipe(map((data) => data));
+  }
 
   /** Used for dry-run or testing. */
   async fakeDeleteDir(_path: string): Promise<boolean> {

src/services/files/unix-files.service.ts

@@ -2,25 +2,16 @@ import { exec } from 'child_process';
 
 import { FileService } from './files.service.js';
 import { IListDirParams } from '../../interfaces/index.js';
-import { Observable, Subject, map, tap } from 'rxjs';
+import { Observable, Subject } from 'rxjs';
 import { StreamService } from '../stream.service.js';
 import { FileWorkerService } from './files.worker.service.js';
 
 export abstract class UnixFilesService extends FileService {
   constructor(
     protected streamService: StreamService,
-    protected fileWorkerService: FileWorkerService,
+    public override fileWorkerService: FileWorkerService,
   ) {
-    super();
-  }
-
-  getFolderSize(path: string): Observable<number> {
-    const stream$ = new Subject<number>();
-    this.fileWorkerService.getFolderSize(stream$, path);
-    return stream$.pipe(
-      map((data) => data),
-      // tap((data) => console.log(data)),
-    );
+    super(fileWorkerService);
   }
 
   listDir(params: IListDirParams): Observable<string> {

src/services/files/windows-files.service.ts

@@ -1,6 +1,6 @@
 import { StreamService } from '../index.js';
 
-import { Subject, Observable, map } from 'rxjs';
+import { Subject, Observable } from 'rxjs';
 import { FileService } from './files.service.js';
 import { WindowsStrategyManager } from '../../strategies/windows-remove-dir.strategy.js';
 import { FileWorkerService } from './files.worker.service.js';
@@ -12,16 +12,9 @@ export class WindowsFilesService extends FileService {
 
   constructor(
     private readonly streamService: StreamService,
-    protected fileWorkerService: FileWorkerService,
+    public override fileWorkerService: FileWorkerService,
   ) {
-    super();
-  }
-
-  // TODO this is the same as unix. Move to FileService.
-  getFolderSize(path: string): Observable<number> {
-    const stream$ = new Subject<number>();
-    this.fileWorkerService.getFolderSize(stream$, path);
-    return stream$.pipe(map((data) => +data));
+    super(fileWorkerService);
   }
 
   listDir(params: IListDirParams): Observable<string> {