Update ncnn detection (#296)

source/ncnn.js

@@ -10,6 +10,16 @@ ncnn.ModelFactory = class {
 
     match(context) {
         const identifier = context.identifier.toLowerCase();
+        if (identifier.endsWith('.param.bin') || identifier.endsWith('.ncnnmodel')) {
+            const stream = context.stream;
+            if (stream.length > 4) {
+                const buffer = stream.peek(4);
+                const signature = (buffer[0] | buffer[1] << 8 | buffer[2] << 16 | buffer [3] << 24) >>> 0;
+                if (signature == 0x007685DD) {
+                    return 'ncnn.model.bin';
+                }
+            }
+        }
         if (identifier.endsWith('.param') || identifier.endsWith('.cfg.ncnn')) {
             const reader = text.Reader.open(context.stream, 2048);
             const signature = reader.read();
@@ -23,16 +33,6 @@ ncnn.ModelFactory = class {
                 }
             }
         }
-        if (identifier.endsWith('.param.bin')) {
-            const stream = context.stream;
-            if (stream.length > 4) {
-                const buffer = stream.peek(4);
-                const signature = (buffer[0] | buffer[1] << 8 | buffer[2] << 16 | buffer [3] << 24) >>> 0;
-                if (signature == 0x007685DD) {
-                    return 'ncnn.model.bin';
-                }
-            }
-        }
         if (identifier.endsWith('.bin') || identifier.endsWith('.weights.ncnn')) {
             if (identifier == 'snapshot_blob.bin' || identifier === 'v8_context_snapshot.bin') {
                 return undefined;

source/view.js

@@ -1535,7 +1535,7 @@ view.ModelFactoryService = class {
         this.register('./dlc', [ '.dlc' ]);
         this.register('./armnn', [ '.armnn', '.json' ]);
         this.register('./mnn', ['.mnn']);
-        this.register('./ncnn', [ '.param', '.bin', '.cfg.ncnn', '.weights.ncnn' ]);
+        this.register('./ncnn', [ '.param', '.bin', '.cfg.ncnn', '.weights.ncnn', '.ncnnmodel' ]);
         this.register('./tnn', [ '.tnnproto', '.tnnmodel' ]);
         this.register('./tengine', ['.tmfile']);
         this.register('./mslite', [ '.ms']);