fix: small fix for windows

CommunitySolidServer · Nov 25, 2021 · 0ac3bb5 · 0ac3bb5
1 parent 243d010
commit 0ac3bb5
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 5 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,13 @@
+{
+    "files.exclude": {
+        "**/.git": true,
+        "**/.svn": true,
+        "**/.hg": true,
+        "**/CVS": true,
+        "**/.DS_Store": true,
+        "**/Thumbs.db": true,
+        "**/**.json": false,
+        "**/**.spec.ts": false
+    },
+    "explorerExclude.backup": null
+}
diff --git a/config/quota-file.json b/config/quota-file.json
@@ -44,7 +44,7 @@
     },
     {
       "@id": "urn:solid-server:default:SizeReporter",
-      "FileSizeReporter:_ignoreFolders": [ "^/\\.internal/?$" ]
+      "FileSizeReporter:_ignoreFolders": [ "^/\\.internal$" ]
     }
   ]
 }
diff --git a/src/storage/size-reporter/FileSizeReporter.ts b/src/storage/size-reporter/FileSizeReporter.ts
@@ -18,7 +18,7 @@ export class FileSizeReporter implements SizeReporter<string> {
   public constructor(fileIdentifierMapper: FileIdentifierMapper, rootFilePath: string, ignoreFolders: string[]) {
     this.fileIdentifierMapper = fileIdentifierMapper;
     this.ignoreFolders = ignoreFolders.map((folder: string): RegExp => new RegExp(folder, 'u'));
-    this.rootFilePath = rootFilePath;
+    this.rootFilePath = normalizeFilePath(rootFilePath);
   }
 
   /** The FileSizeReporter will always return data in the form of bytes */

diff --git a/test/integration/config/quota-global.json b/test/integration/config/quota-global.json
@@ -42,7 +42,7 @@
     },
     {
       "@id": "urn:solid-server:default:SizeReporter",
-      "FileSizeReporter:_ignoreFolders": [ "^/\\.internal/?$" ]
+      "FileSizeReporter:_ignoreFolders": [ "^/\\.internal$" ]
     },
     {
       "@id": "urn:solid-server:test:Instances",

diff --git a/test/integration/config/quota-pod.json b/test/integration/config/quota-pod.json
@@ -42,7 +42,7 @@
     },
     {
       "@id": "urn:solid-server:default:SizeReporter",
-      "FileSizeReporter:_ignoreFolders": [ "^/\\.internal/?$" ]
+      "FileSizeReporter:_ignoreFolders": [ "^/\\.internal$" ]
     },
     {
       "@id": "urn:solid-server:test:Instances",

diff --git a/test/unit/storage/size-reporter/FileSizeReporter.test.ts b/test/unit/storage/size-reporter/FileSizeReporter.test.ts
@@ -18,7 +18,7 @@ describe('A FileSizeReporter', (): void => {
   const fileSizeReporter = new FileSizeReporter(
     mapper,
     fileRoot,
-    [ '^/\\.internal/?$' ],
+    [ '^/\\.internal$' ],
   );
 
   beforeAll(async(): Promise<void> => {