[Issue GerryFerdinandus#35] add support for ngosang via menu

TngosangTrackerList refactor.
Do not download everything

Also update the unit test
Add mising all WS test

Author: GerryFerdinandus

source/code/main.lfm

@@ -16,7 +16,7 @@ object FormTrackerModify: TFormTrackerModify
   OnDropFiles = FormDropFiles
   OnShow = FormShow
   Position = poScreenCenter
-  LCLVersion = '1.8.0.5'
+  LCLVersion = '2.0.4.0'
   object PageControl: TPageControl
     Left = 0
     Height = 587
@@ -270,17 +270,17 @@ object FormTrackerModify: TFormTrackerModify
         Caption = '-'
       end
       object MenuTrackersDeleteUnstableTrackers: TMenuItem
-        Caption = 'Delete UNSTABLE trackers'
+        Caption = 'Delete UNSTABLE trackers (Data from newTrackon)'
         OnClick = MenuTrackersDeleteTrackersWithStatusClick
       end
       object MenuTrackersDeleteDeadTrackers: TMenuItem
         Tag = 1
-        Caption = 'Delete DEAD trackers'
+        Caption = 'Delete DEAD trackers (Data from newTrackon)'
         OnClick = MenuTrackersDeleteTrackersWithStatusClick
       end
       object MenuTrackersDeleteUnknownTrackers: TMenuItem
         Tag = 2
-        Caption = 'Delete UNKNOWN trackers'
+        Caption = 'Delete UNKNOWN trackers  (Data from newTrackon)'
         OnClick = MenuTrackersDeleteTrackersWithStatusClick
       end
       object MenuTrackersSeperator2: TMenuItem
@@ -353,6 +353,41 @@ object FormTrackerModify: TFormTrackerModify
         OnClick = MenuItemOnlineCheckSubmitNewTrackonClick
       end
     end
+    object MenuItem1: TMenuItem
+      Caption = 'ngosang/trackerslist'
+      object MenuItemNgosangAppendBest: TMenuItem
+        Caption = 'Append best'
+        OnClick = MenuItemNgosangAppendBestClick
+      end
+      object MenuItemNgosangAppendAll: TMenuItem
+        Caption = 'Append all'
+        OnClick = MenuItemNgosangAppendAllClick
+      end
+      object MenuItemNgosangAppendAllUdp: TMenuItem
+        Caption = 'Append all udp'
+        OnClick = MenuItemNgosangAppendAllUdpClick
+      end
+      object MenuItemNgosangAppendAllHttp: TMenuItem
+        Caption = 'Append all http'
+        OnClick = MenuItemNgosangAppendAllHttpClick
+      end
+      object MenuItemNgosangAppendAllHttps: TMenuItem
+        Caption = 'Append all https'
+        OnClick = MenuItemNgosangAppendAllHttpsClick
+      end
+      object MenuItemNgosangAppendAllWs: TMenuItem
+        Caption = 'Append all ws'
+        OnClick = MenuItemNgosangAppendAllWsClick
+      end
+      object MenuItemNgosangAppendAllBestIp: TMenuItem
+        Caption = 'Append best ip'
+        OnClick = MenuItemNgosangAppendAllBestIpClick
+      end
+      object MenuItemNgosangAppendAllIp: TMenuItem
+        Caption = 'Append all ip'
+        OnClick = MenuItemNgosangAppendAllIpClick
+      end
+    end
     object MenuHelp: TMenuItem
       Caption = '&Help'
       object MenuHelpVisitWebsite: TMenuItem
@@ -367,9 +402,13 @@ object FormTrackerModify: TFormTrackerModify
         Caption = '-'
       end
       object MenuHelpVisitNewTrackon: TMenuItem
-        Caption = '&Visit website newTrackon'
+        Caption = 'Visit website new&Trackon'
         OnClick = MenuHelpVisitNewTrackonClick
       end
+      object MenuHelpVisitNgosang: TMenuItem
+        Caption = 'Visit website &ngosang (github)'
+        OnClick = MenuHelpVisitNgosangClick
+      end
     end
   end
 end

source/code/ngosang_trackerslist.pas

@@ -24,6 +24,7 @@ interface
     ntl_URL_All_HTTPS,//< Download from internet
     ntl_URL_All_IP,//< Download from internet
     ntl_URL_All_UDP,//< Download from internet
+    ntl_URL_All_WS,//< Download from internet
     ntl_URL_Best,//< Download from internet
     ntl_URL_Best_IP//< Download from internet
     );
@@ -33,29 +34,29 @@ interface
   TngosangTrackerList = class
   private
     FTRackerList: array [Tngosang_List] of TStringList;
-
-    procedure DownloadTracker(ngosang_List: Tngosang_List);
-
+    function DownloadTracker(ngosang_List: Tngosang_List): TStringList;
   public
 
-    property TrackerList_Blacklist: TStringList read FTRackerList[ntl_URL_Blacklist];
+    property TrackerList_Blacklist: TStringList index ntl_URL_Blacklist
+      read DownloadTracker;
 
-    property TrackerList_All: TStringList read FTrackerList[ntl_URL_All];
+    property TrackerList_All: TStringList index ntl_URL_All read DownloadTracker;
 
-    property TrackerList_All_HTTP: TStringList read FTrackerList[ntl_URL_All_HTTP];
+    property TrackerList_All_HTTP: TStringList index ntl_URL_All_HTTP
+      read DownloadTracker;
 
-    property TrackerList_All_HTTPS: TStringList read FTrackerList[ntl_URL_All_HTTPS];
+    property TrackerList_All_HTTPS: TStringList index ntl_URL_All_HTTPS
+      read DownloadTracker;
 
-    property TrackerList_All_IP: TStringList read FTrackerList[ntl_URL_All_IP];
+    property TrackerList_All_IP: TStringList index ntl_URL_All_IP read DownloadTracker;
 
-    property TrackerList_All_UDP: TStringList read FTrackerList[ntl_URL_All_UDP];
+    property TrackerList_All_UDP: TStringList index ntl_URL_All_UDP read DownloadTracker;
 
-    property TrackerList_Best: TStringList read FTrackerList[ntl_URL_Best];
+    property TrackerList_All_WS: TStringList index ntl_URL_All_WS read DownloadTracker;
 
-    property TrackerList_Best_IP: TStringList read FTrackerList[ntl_URL_Best_IP];
+    property TrackerList_Best: TStringList index ntl_URL_Best read DownloadTracker;
 
-    //Download all the trackers via API
-    function DownloadTrackers: boolean;
+    property TrackerList_Best_IP: TStringList index ntl_URL_Best_IP read DownloadTracker;
 
     //create/destroy class object
     constructor Create;
@@ -75,38 +76,27 @@ implementation
     'https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all_https.txt',
     'https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all_ip.txt',
     'https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all_udp.txt',
+    'https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all_ws.txt',
     'https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_best.txt',
     'https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_best_ip.txt'
     );
 
 { TngosangTrackerList }
-procedure TngosangTrackerList.DownloadTracker(ngosang_List: Tngosang_List);
-begin
-  //download via URL and put the data in the TrackerList
-  FTRackerList[ngosang_List].DelimitedText :=
-    TFPCustomHTTPClient.SimpleGet(URL[ngosang_List]);
-
-  //Clean up the tracker list
-  SanatizeTrackerList(FTRackerList[ngosang_List]);
-end;
-
-
-function TngosangTrackerList.DownloadTrackers: boolean;
-var
-  i: Tngosang_List;
+function TngosangTrackerList.DownloadTracker(ngosang_List: Tngosang_List): TStringList;
 begin
   try
-    //download all the list one by one
-    for i in Tngosang_List do
-    begin
-      DownloadTracker(i);
-    end;
+    //download via URL and put the data in the TrackerList
+    FTRackerList[ngosang_List].DelimitedText :=
+      TFPCustomHTTPClient.SimpleGet(URL[ngosang_List]);
+
+    //Clean up the tracker list
+    SanatizeTrackerList(FTRackerList[ngosang_List]);
 
-    Result := True;
   except
     //No OpenSSL or web server is down
-    Result := False;
   end;
+
+  Result := FTrackerList[ngosang_List];
 end;
 
 constructor TngosangTrackerList.Create;
@@ -135,4 +125,3 @@ destructor TngosangTrackerList.Destroy;
 end;
 
 end.
-

source/test/test_ngosang_trackers_list.pas

@@ -23,8 +23,6 @@ implementation
 
 procedure TTestNgosangTrackersList.Test_DownloadAPI;
 begin
-  Check(FngosangTrackerList.DownloadTrackers, 'Download the ngosang API');
-
   Check(FngosangTrackerList.TrackerList_Blacklist.Count > 0,
     'TrackerList_Blacklist should never be empty');
 
@@ -47,6 +45,10 @@ procedure TTestNgosangTrackersList.Test_DownloadAPI;
     FngosangTrackerList.TrackerList_All_UDP.Count > 0,
     'TrackerList_All_UDP should never be empty');
 
+  Check(
+    FngosangTrackerList.TrackerList_All_WS.Count > 0,
+    'TrackerList_All_WS should never be empty');
+
   Check(
     FngosangTrackerList.TrackerList_Best.Count > 0,
     'TrackerList_Best should never be empty');