Updated

EonaCat.Blocky.deps.json

@@ -6,10 +6,11 @@
   "compilationOptions": {},
   "targets": {
     ".NETCoreApp,Version=v7.0": {
-      "EonaCat.Blocky/3.3.6": {
+      "EonaCat.Blocky/3.3.7": {
         "dependencies": {
-          "EonaCat.Dns": "3.3.6",
+          "EonaCat.Dns": "3.3.7",
           "EonaCat.Logger": "1.0.9",
+          "LigerShark.WebOptimizer.Core": "3.0.384",
           "Microsoft.AspNet.SignalR": "2.4.3",
           "System.IO": "4.3.0"
         },
@@ -134,7 +135,7 @@
           }
         }
       },
-      "EonaCat.Network/1.0.7": {
+      "EonaCat.Network/1.0.8": {
         "dependencies": {
           "EonaCat.Controls": "1.0.2",
           "EonaCat.Json": "1.0.3",
@@ -149,6 +150,18 @@
         }
       },
       "jQuery/1.6.4": {},
+      "LigerShark.WebOptimizer.Core/3.0.384": {
+        "dependencies": {
+          "NUglify": "1.16.1",
+          "System.Text.Json": "5.0.2"
+        },
+        "runtime": {
+          "lib/netcoreapp3.0/WebOptimizer.Core.dll": {
+            "assemblyVersion": "3.0.384.0",
+            "fileVersion": "3.0.384.0"
+          }
+        }
+      },
       "Microsoft.AspNet.SignalR/2.4.3": {
         "dependencies": {
           "Microsoft.AspNet.SignalR.JS": "2.4.3",
@@ -295,6 +308,14 @@
           }
         }
       },
+      "NUglify/1.16.1": {
+        "runtime": {
+          "lib/net5.0/NUglify.dll": {
+            "assemblyVersion": "1.16.1.0",
+            "fileVersion": "1.16.1.0"
+          }
+        }
+      },
       "Owin/1.0.0": {
         "runtime": {
           "lib/net40/Owin.dll": {
@@ -572,6 +593,7 @@
       },
       "System.Text.Encoding.CodePages/7.0.0": {},
       "System.Text.Encodings.Web/4.5.0": {},
+      "System.Text.Json/5.0.2": {},
       "System.Threading.Tasks/4.3.0": {
         "dependencies": {
           "Microsoft.NETCore.Platforms": "1.1.0",
@@ -598,7 +620,7 @@
           }
         }
       },
-      "EonaCat.Dns/3.3.6": {
+      "EonaCat.Dns/3.3.7": {
         "dependencies": {
           "EonaCat.Cache.Memory": "1.0.1",
           "EonaCat.Controls": "1.0.2",
@@ -606,7 +628,8 @@
           "EonaCat.Helpers": "1.0.7",
           "EonaCat.Json": "1.0.3",
           "EonaCat.Logger": "1.0.9",
-          "EonaCat.Network": "1.0.7",
+          "EonaCat.Network": "1.0.8",
+          "LigerShark.WebOptimizer.Core": "3.0.384",
           "System.Runtime.Caching": "7.0.0",
           "sqlite-net-pcl": "1.8.116"
         },
@@ -617,7 +640,7 @@
     }
   },
   "libraries": {
-    "EonaCat.Blocky/3.3.6": {
+    "EonaCat.Blocky/3.3.7": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
@@ -699,12 +722,12 @@
       "path": "eonacat.matchers/1.0.0",
       "hashPath": "eonacat.matchers.1.0.0.nupkg.sha512"
     },
-    "EonaCat.Network/1.0.7": {
+    "EonaCat.Network/1.0.8": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-G3hWhULxKV7mPLhmaXnWXjrihEqrQNrE0O8QwcHzvDz7zO77CgUU84Uiv9Ol4V3iCsk3szCmpms96OeJebpHIg==",
-      "path": "eonacat.network/1.0.7",
-      "hashPath": "eonacat.network.1.0.7.nupkg.sha512"
+      "sha512": "sha512-3uOcRtRrllcjrJrXW2mvf9wnecrmI34igfMNMxIzPryOJwhos0juiXiczFMmLEIrxwAvnjZmVa0F9Xpj+nPI6Q==",
+      "path": "eonacat.network/1.0.8",
+      "hashPath": "eonacat.network.1.0.8.nupkg.sha512"
     },
     "jQuery/1.6.4": {
       "type": "package",
@@ -713,6 +736,13 @@
       "path": "jquery/1.6.4",
       "hashPath": "jquery.1.6.4.nupkg.sha512"
     },
+    "LigerShark.WebOptimizer.Core/3.0.384": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-sl/lkvyT+3gPkxJnSZBwb5tsILsQbMDqYGSUvdZiVOf3vovX8I1SnU+rpM9J092S4fABcI+/ChTh1ZY9NKy2Ag==",
+      "path": "ligershark.weboptimizer.core/3.0.384",
+      "hashPath": "ligershark.weboptimizer.core.3.0.384.nupkg.sha512"
+    },
     "Microsoft.AspNet.SignalR/2.4.3": {
       "type": "package",
       "serviceable": true,
@@ -867,6 +897,13 @@
       "path": "newtonsoft.json/6.0.4",
       "hashPath": "newtonsoft.json.6.0.4.nupkg.sha512"
     },
+    "NUglify/1.16.1": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-iAbP7HDVq4TEMzQ23/RyS1CcnM7g0Vx6S4hgg/ODyEUK/1rp9L0oFSsFhN4k5viivknlOBSXez1X+tN8Xfcz5g==",
+      "path": "nuglify/1.16.1",
+      "hashPath": "nuglify.1.16.1.nupkg.sha512"
+    },
     "Owin/1.0.0": {
       "type": "package",
       "serviceable": true,
@@ -1000,6 +1037,13 @@
       "path": "system.text.encodings.web/4.5.0",
       "hashPath": "system.text.encodings.web.4.5.0.nupkg.sha512"
     },
+    "System.Text.Json/5.0.2": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==",
+      "path": "system.text.json/5.0.2",
+      "hashPath": "system.text.json.5.0.2.nupkg.sha512"
+    },
     "System.Threading.Tasks/4.3.0": {
       "type": "package",
       "serviceable": true,
@@ -1014,7 +1058,7 @@
       "path": "system.windows.extensions/7.0.0",
       "hashPath": "system.windows.extensions.7.0.0.nupkg.sha512"
     },
-    "EonaCat.Dns/3.3.6": {
+    "EonaCat.Dns/3.3.7": {
       "type": "project",
       "serviceable": false,
       "sha512": ""

Views/BlockList/Index.cshtml

@@ -57,7 +57,7 @@
                         if (row.IsUpdating)
                         {
                             linkUpdate = '<div class="form-group">\
-                                                <i class="fas fa-undo rotatingleft"></i> Updating\
+                                                <i class="fas fa-undo rotatingleft"></i>\
                                                             <div id="progress' + row.Id + '"></div></div>'
                             fetchProgress(row.Id, row.Url);
                         }
@@ -124,16 +124,28 @@
                     
                     if (data.total > 0 && data.progress < 100) 
                     {
-                        $('#progress' + id).html("<small>(" + data.current + "/" + data.total + ") (" + data.progress + "%)</small>");
+                        $('#progress' + id).html("Updating: <small>(" + data.current + "/" + data.total + ") (" + data.progress + "%)</small>");
                     }
 
-                    if (typeof(data.total) == undefined || data.total == 0 || data.progress < 100) {
+                    if (data.status == 'Completed') {
+                        $('#progress' + id).html("Completed");
+                    }
+
+                    if (typeof (data.total) == undefined || data.total == 0 || data.status != 'Completed') {
                         setTimeout(fetchProgress(id, url), 5000);
                     }
-                    else
+                    
+                    if (data.progress == 100) 
                     {
-                        $('#progress' + id).html(data.progress);
-                    }
+                        if (data.status == 'Completed')
+                        {
+                            $('#progress' + id).html("Completed");
+                        }
+                        else
+                        {
+                            $('#progress' + id).html("Status: " + data.status);
+                        }
+                    }                
                 });
             }
         });

Views/Shared/tabs.cshtml

@@ -14,18 +14,19 @@
             </button>
         }
 
-        @using (Html.BeginForm("UpdateBlockySetup", "Domain"))
+        @if (ViewBag.Title != null && ViewBag.Title.ToString().Contains("Blocky"))
         {
-            <label>&nbsp;</label>
-            <button type="submit" title="Update blocky setup" class="btn btn-primary btn-sm" style="float: right; margin-right: 5px" onclick="return confirm('Are you sure you want to update the blockList with the the URL from the blocky setup? (this will download the newest blocky setup from the internet)')">
-                <i class="fas fa-undo"></i>
-            </button>
+            @using (Html.BeginForm("UpdateSetup", "Domain"))
+            {
+                <button type="submit" title="Update setup" class="btn btn-primary btn-sm" style="float: right; margin-right: 5px" onclick="return confirm('Are you sure you want to overwrite the blockList with the the URLs from the setup? (this will download the newest setup from the internet)')">
+                    <i class="fas fa-undo"></i>
+                </button>
+            }
         }
 
         @using (Html.BeginForm("UpdateBlockList", "Domain"))
         {
-            <label>&nbsp;</label>
-            <button type="submit" title="Update blocklist" class="btn btn-warning btn-sm" style="float: right; margin-right: 5px" onclick="return confirm('Are you sure you want to update blockList with the URLs specified in the database? (this will download new entries from the internet)')">
+            <button type="submit" title="Update blocklist" class="btn btn-warning btn-sm" style="float: right; margin-right: 5px" onclick="return confirm('Are you sure you want to update the blockList with the URLs specified in the database? (this will download new entries from the internet)')">
                 <i class="fas fa-undo"></i>
             </button>
         }