From 61cfee222f6a7ed87e47233ad5e7b317dd426be0 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Wed, 27 Feb 2019 19:10:33 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index.js}                                 |  2 +-
 .../core/{ => FileDetector}/signatures.json   | 53 ++++++++++---------
 2 files changed, 28 insertions(+), 27 deletions(-)
 rename server/core/{FileDetector.js => FileDetector/index.js} (99%)
 rename server/core/{ => FileDetector}/signatures.json (99%)

diff --git a/server/core/FileDetector.js b/server/core/FileDetector/index.js
similarity index 99%
rename from server/core/FileDetector.js
rename to server/core/FileDetector/index.js
index b9b1a0be..21baa109 100644
--- a/server/core/FileDetector.js
+++ b/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);
             });
diff --git a/server/core/signatures.json b/server/core/FileDetector/signatures.json
similarity index 99%
rename from server/core/signatures.json
rename to server/core/FileDetector/signatures.json
index b5de2ff3..691df440 100644
--- a/server/core/signatures.json
+++ b/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" }
+      ]
+      }
+    ]
   }
+
 ]