[Issue GerryFerdinandus#27] add support for '/announce.php'

also update the unit test

Author: GerryFerdinandus

source/code/main.pas

@@ -1004,13 +1004,13 @@ function TFormTrackerModify.CopyUserInputNewTrackersToList: boolean;
         Result := TrackerURLWithAnnounce(TrackerStr);
         if not Result then
         begin
-          ErrorStr := 'ERROR: Tracker URL must end with /announce';
+          ErrorStr := 'ERROR: Tracker URL must end with /announce or /announce.php';
         end;
       end;
     end
     else
     begin
-      ErrorStr := 'ERROR: Tracker URL must begin with http:// or udp://';
+      ErrorStr := 'ERROR: Tracker URL must begin with http://, http:// or udp://';
     end;
 
     if Result then

source/code/torrent_miscellaneous.pas

@@ -709,9 +709,11 @@ function DecodeConsoleUpdateParameter(const ConsoleUpdateParameter: UTF8String;
 function TrackerURLWithAnnounce(const TrackerURL: UTF8String): boolean;
 const
   ANNOUNCE_STRING: string = '/announce';
+  ANNOUNCE_PHP_STRING: string = '/announce.php';
 begin
   //TrackerURL must end with ANNOUNCE_STRING
-  Result := RightStr(TrackerURL, length(ANNOUNCE_STRING)) = ANNOUNCE_STRING;
+  Result := (RightStr(TrackerURL, length(ANNOUNCE_STRING)) = ANNOUNCE_STRING) or
+    (RightStr(TrackerURL, length(ANNOUNCE_PHP_STRING)) = ANNOUNCE_PHP_STRING)
 end;
 
 end.

source/project/unit_test/tracker_editor_test.lpi

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="9"/>
+    <Version Value="10"/>
     <PathDelim Value="\"/>
     <General>
       <SessionStorage Value="None"/>
@@ -13,9 +13,6 @@
     <i18n>
       <EnableI18N LFM="False"/>
     </i18n>
-    <VersionInfo>
-      <StringTable ProductVersion=""/>
-    </VersionInfo>
     <BuildModes Count="3">
       <Item1 Name="Default" Default="True"/>
       <Item2 Name="Debug">

source/test/test_start_up_parameter.pas

@@ -363,28 +363,34 @@ procedure TTestStartUpParameter.Test_Tracker_UserInput_All_Different_URL;
   TrackerURL: string;
 const
   ANNOUNCE = '/announce';
+  ANNOUNCE_PHP = '/announce.php';
 begin
   //Test if all the tracker update mode is working
   for TrackerListOrder in TTrackerListOrder do
   begin
     TrackerURL := 'udp://test.com';
     Add_One_URL(TrackerListOrder, TrackerURL, False);
     Add_One_URL(TrackerListOrder, TrackerURL + ANNOUNCE, True);
+    Add_One_URL(TrackerListOrder, TrackerURL + ANNOUNCE_PHP, True);
 
     TrackerURL := 'http://test.com';
     Add_One_URL(TrackerListOrder, TrackerURL, False);
     Add_One_URL(TrackerListOrder, TrackerURL + ANNOUNCE, True);
+    Add_One_URL(TrackerListOrder, TrackerURL + ANNOUNCE_PHP, True);
 
     TrackerURL := 'https://test.com';
     Add_One_URL(TrackerListOrder, TrackerURL, False);
     Add_One_URL(TrackerListOrder, TrackerURL + ANNOUNCE, True);
+    Add_One_URL(TrackerListOrder, TrackerURL + ANNOUNCE_PHP, True);
 
-    //webtorrent does NOT have announce
+    //webtorrent may have NOT announce
     TrackerURL := 'ws://test.com';
     Add_One_URL(TrackerListOrder, TrackerURL, True);
+    Add_One_URL(TrackerListOrder, TrackerURL + ANNOUNCE, True);
 
     TrackerURL := 'wss://test.com';
     Add_One_URL(TrackerListOrder, TrackerURL, True);
+    Add_One_URL(TrackerListOrder, TrackerURL + ANNOUNCE, True);
   end;
 end;