@mountainpass/addressr 1.0.260 → 1.0.261

package/lib/service/address-service.js

@@ -68,6 +68,10 @@ var _crypto = require("crypto");
 
 var _crypto2 = _interopRequireDefault(_crypto);
 
+var _globPromise = require("glob-promise");
+
+var _globPromise2 = _interopRequireDefault(_globPromise);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /* eslint-disable eslint-comments/disable-enable-pair */
@@ -1086,7 +1090,8 @@ const {
 } = require('fs').promises;
 
 async function getFiles(currentDir, baseDir) {
-  const dir = resolve(baseDir, currentDir);
+  const dir = _path2.default.resolve(baseDir, currentDir);
+
   logger(`reading ${dir} (${currentDir} in ${baseDir})`);
   const dirents = await readdir(dir, {
     withFileTypes: true
@@ -1456,23 +1461,21 @@ async function loadGnaf({
     throw new Error(`Data dir '${unzipped}' is empty`);
   }
 
-  if (contents.length == 1) {
-    // before feb20, the gnaf zip had an intermediate directory
-    const mainDirectory = `${unzipped}/${contents[0]}`;
-    logger('1. Main Data dir', mainDirectory);
-    await loadGnafData(mainDirectory, {
-      refresh
-    });
-  } else if (contents.includes('Counts.csv')) {
-    // feb20 doesn't have an intermediate directory
-    const mainDirectory = unzipped;
-    logger('2. Main Data dir', mainDirectory);
-    await loadGnafData(mainDirectory, {
-      refresh
-    });
-  } else {
-    throw new Error(`Data dir '${unzipped}' has unexpected contents: ${contents}`);
+  const gnafDir = await (0, _globPromise2.default)('**/G-NAF/', {
+    cwd: unzipped
+  });
+  console.log(gnafDir);
+
+  if (gnafDir.length === 0) {
+    throw new Error(`Cannot find 'G-NAF' directory in Data dir '${unzipped}'`);
   }
+
+  const mainDirectory = _path2.default.dirname(`${unzipped}/${gnafDir[0].slice(0, -1)}`);
+
+  logger('Main Data dir', mainDirectory);
+  await loadGnafData(mainDirectory, {
+    refresh
+  });
 }
 /**
  * Get Addresses

package/lib/version.js

@@ -4,4 +4,4 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 // generated by genversion
-const version = exports.version = '1.0.260';
+const version = exports.version = '1.0.261';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mountainpass/addressr",
-  "version": "1.0.260",
+  "version": "1.0.261",
   "description": "Australian Address Validation, Search and Autocomplete",
   "author": "Mountain Pass <addressr@mountain-pass.com.au>",
   "contributors": [
@@ -131,12 +131,14 @@
   "license": "Apache-2.0",
   "private": false,
   "dependencies": {
-    "@elastic/elasticsearch": "^7.13.0",
+    "@elastic/elasticsearch": "^7.15.0",
     "@mountainpass/waycharter": "^1.0.68",
     "debug": "^4.1.1",
     "directory-exists": "^2.0.1",
     "dotenv": "^10.0.0",
     "express": "^4.17.1",
+    "glob": "^7.1.7",
+    "glob-promise": "^4.2.0",
     "got": "^9.6.0",
     "http-link-header": "1.0.2",
     "js-yaml": "^3.3.0",