Fix a bug with empty domain groups and missing files (#31)

* Fix a bug with empty domain groups, follow-up #29

* Fix bug with empty domain groups and missing files

Author: Chan Chak Shing

script/libs/splitDomainsByTlds.js

@@ -6,18 +6,21 @@
  */
 function splitDomainsByTlds(domains) {
   let retval = [domains];
-  for (let tldCounts = 1; tldCounts < 2; ++tldCounts) {
+  for (let tldCounts = 1; tldCounts < 3; ++tldCounts) {
     let tlds = domains.map((domain) =>
       domain.split(".").reverse().slice(0, tldCounts).reverse().join(".")
     );
 
     // remove possible duplicates
     tlds = Array.from(new Set(tlds));
+    let tmp = tlds
+      .map((tld) =>
+        domains.filter((domain) => domain.endsWith(`.${tld}`) || domain === tld)
+      )
+      .filter((arr) => arr.length > 0);
 
-    if (tlds.length > 1) {
-      retval = tlds.map((tld) =>
-        domains.filter((domain) => domain.endsWith(`.${tld}`))
-      );
+    if (tmp.length > 1) {
+      retval = tmp;
       break;
     }
   }

script/ruleset-update.js

@@ -18,8 +18,7 @@ if (process.argv.length <= 2) {
 }
 
 // create a backup of the input FILE if it does not exist
-// path.normalize mess up files with underscore in their names
-const filename = process.argv[2];
+const filename = path.normalize(process.argv[2]);
 const backupFilename = filename + ".bak";
 if (!fs.existsSync(backupFilename)) {
   fs.copyFileSync(filename, backupFilename);
@@ -64,11 +63,11 @@ for (const domains of domainGroups) {
   const command = rawCommandParts.filter((part) => part != null).join(" ");
   child_process.execSync(command);
 
-  // remove the original file if neccessary
-  if (domainGroups.length > 1) {
-    fs.unlinkSync(filename);
-  }
-
   // remove temporary file
   fs.unlinkSync(tmpFilename);
 }
+
+// remove the original file if neccessary
+if (domainGroups.length > 1) {
+  fs.unlinkSync(filename);
+}