Переименования

server/core/FileDetector.js → server/core/FileDetector/index.js

@@ -4,7 +4,7 @@ const signatures = require('./signatures.json');
 class FileDetector {
     detectFile(filename) {
         return new Promise((resolve, reject) => {
-            this.fromFile(filename, (err, result) => {
+            this.fromFile(filename, 2000, (err, result) => {
                 if (err) reject(err);
                 resolve(result);
             });

server/core/signatures.json → server/core/FileDetector/signatures.json

@@ -1,30 +1,4 @@
 [
-  {
-    "type": "xml",
-    "ext": "xml",
-    "mime": "application/xml",
-    "rules": [
-      { "type": "or", "rules":
-      [
-        { "type": "equal", "end": 19, "bytes": "3c3f786d6c2076657273696f6e3d22312e3022" }
-      ]
-      }
-    ]
-  },
-
-  {
-    "type": "docx",
-    "ext": "docx",
-    "mime": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-    "rules": [
-      { "type": "or", "rules":
-      [
-        { "type": "equal", "end": 4, "bytes": "504b0304" }
-      ]
-      }
-    ]
-  },
-
   {
     "type": "jpg",
     "ext": "jpg",
@@ -722,5 +696,32 @@
       ]
       }
     ]
+  },
+
+  {
+    "type": "docx",
+    "ext": "docx",
+    "mime": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+    "rules": [
+      { "type": "or", "rules":
+      [
+        { "type": "contains", "bytes": "6170706c69636174696f6e2f766e642e6f70656e786d6c666f726d6174732d6f6666696365646f63756d656e74" }
+      ]
+      }
+    ]
+  },
+
+  {
+    "type": "xml",
+    "ext": "xml",
+    "mime": "application/xml",
+    "rules": [
+      { "type": "or", "rules":
+      [
+        { "type": "equal", "end": 19, "bytes": "3c3f786d6c2076657273696f6e3d22312e3022" }
+      ]
+      }
+    ]
   }
+
 ]