fix: disallow unclaimed space assignment when host drive is filtered

MauriceNino · Mar 2, 2023 · 997cec6 · 997cec6
1 parent 5014f09
commit 997cec6
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 13 deletions.
diff --git a/apps/api/__TESTS__/dynamic-info.test.ts b/apps/api/__TESTS__/dynamic-info.test.ts
@@ -28,6 +28,7 @@ const toStorageInp = (inp: TestCase) =>
 describe('Dynamic Info', () => {
   beforeEach(() => {
     CONFIG.running_in_docker = true;
+    CONFIG.fs_device_filter = [];
   });
 
   describe('Storage', () => {
@@ -146,6 +147,7 @@ describe('Dynamic Info', () => {
       expect(output).to.deep.equal(TEST_CASE_18.output);
     });
     it('Test Case 19', () => {
+      CONFIG.fs_device_filter = ['sda'];
       const output = new DynamicStorageMapper(
         false,
         ...toStorageInp(TEST_CASE_19)

diff --git a/apps/api/__TESTS__/static-info.test.ts b/apps/api/__TESTS__/static-info.test.ts
@@ -28,6 +28,7 @@ const toStorageInp = (inp: TestCase) =>
 describe('Static Info', () => {
   beforeEach(() => {
     CONFIG.running_in_docker = true;
+    CONFIG.fs_device_filter = [];
   });
 
   describe('Storage', () => {
@@ -98,6 +99,7 @@ describe('Static Info', () => {
       expect(output).to.deep.equal(TEST_CASE_18.layout);
     });
     it('Test Case 19', () => {
+      CONFIG.fs_device_filter = ['sda'];
       const output = mapToStorageLayout(false, ...toStorageInp(TEST_CASE_19));
       expect(output).to.deep.equal(TEST_CASE_19.layout);
     });

diff --git a/apps/api/__TESTS__/test-cases.ts b/apps/api/__TESTS__/test-cases.ts
@@ -6150,10 +6150,6 @@ export const TEST_CASE_19 = {
     },
   ],
   layout: [
-    {
-      size: 15502147584,
-      disks: [{ device: 'sda', brand: 'Kingston', type: 'HD' }],
-    },
     {
       size: 480103981056,
       disks: [{ device: 'sdb', brand: 'Kingston Technology', type: 'SSD' }],
@@ -6196,7 +6192,7 @@ export const TEST_CASE_19 = {
     },
   ],
   output: [
-    680329216, 129046470656, 462745698304, 6725234688, 11663760277504, 0,
-    7385656987648, 3930067537920, 2526756556800, 3755402776576, 3789034754048,
+    129046470656, 462745698304, 6725234688, 11663760277504, 0, 7385656987648,
+    3930067537920, 2526756556800, 3755402776576, 3789034754048,
   ],
 } as any as TestCase;
diff --git a/apps/api/src/config.ts b/apps/api/src/config.ts
@@ -33,7 +33,8 @@ export const CONFIG: Config = {
   speed_test_from_path: penv('SPEED_TEST_FROM_PATH'),
   fs_device_filter: lst(penv('FS_DEVICE_FILTER') ?? ''),
   fs_type_filter: lst(
-    penv('FS_TYPE_FILTER') ?? 'cifs,9p,fuse.rclone,fuse.mergerfs,nfs4,iso9660'
+    penv('FS_TYPE_FILTER') ??
+      'cifs,9p,fuse.rclone,fuse.mergerfs,nfs4,iso9660,fuse.shfs'
   ),
   fs_virtual_mounts: lst(penv('FS_VIRTUAL_MOUNTS') ?? ''),
   disable_integrations: penv('DISABLE_INTEGRATIONS') === 'true',

diff --git a/apps/api/src/data/storage/dynamic.ts b/apps/api/src/data/storage/dynamic.ts
@@ -43,11 +43,7 @@ export class DynamicStorageMapper {
   }
 
   private getHasExplicitHost() {
-    return this.layout.some(({ disks, raidName }) =>
-      this.getIsExplicitHost(
-        this.getBlocksForDisks(disks).concat(this.getBlocksForRaid(raidName))
-      )
-    );
+    return this.getIsExplicitHost(this.validBlocks);
   }
 
   // Helpers

diff --git a/apps/docs/docs/config/features.mdx b/apps/docs/docs/config/features.mdx
@@ -89,7 +89,7 @@ Please also create a [bug ticket](https://github.com/MauriceNino/dashdot/issues/
 repository though, so that we can fix this problem for everyone.
 
 - type: `string (comma separated list)`
-- default: `cifs,9p,fuse.rclone,fuse.mergerfs,nfs4,iso9660`
+- default: `cifs,9p,fuse.rclone,fuse.mergerfs,nfs4,iso9660,fuse.shfs`
 
 ## `DASHDOT_FS_VIRTUAL_MOUNTS`