@@ -100,7 +100,7 @@ TFormTrackerModify = class(TForm)
100100 procedure FormDestroy (Sender: TObject);
101101
102102 // Drag and drop '*.torrent' files/directory or 'tracker.txt'
103- procedure FormDropFiles (Sender: TObject; const FileNames: array of UTF8String );
103+ procedure FormDropFiles (Sender: TObject; const FileNames: array of utf8string );
104104
105105 // At start of the program the form will be show/hide
106106 procedure FormShow (Sender: TObject);
@@ -166,10 +166,10 @@ TFormTrackerModify = class(TForm)
166166 FLogFile, FTrackerFile: TextFile;
167167 FProcessTimeStart, FProcessTimeTotal: TDateTime;
168168 FControlerGridTorrentData: TControlerGridTorrentData;
169- function CheckForAnnounce (const TrackerURL: UTF8String ): boolean;
169+ function CheckForAnnounce (const TrackerURL: utf8string ): boolean;
170170 procedure AppendTrackersToMemoNewTrackers (TrackerList: TStringList);
171171 procedure ShowUserErrorMessage (const ErrorText: string; const FormText: string = ' ' );
172- function TrackerWithURLAndAnnounce (const TrackerURL: UTF8String ): boolean;
172+ function TrackerWithURLAndAnnounce (const TrackerURL: utf8string ): boolean;
173173 procedure UpdateTorrent ;
174174 procedure ShowHourGlassCursor (HourGlass: boolean);
175175 procedure ViewUpdateBegin ;
@@ -182,13 +182,13 @@ TFormTrackerModify = class(TForm)
182182 procedure UpdateViewRemoveTracker ;
183183 function ReloadAllTorrentAndRefreshView : boolean;
184184 function AddTorrentFileList (TorrentFileNameStringList: TStringList): boolean;
185- function ReadAddTrackerFileFromUser (const FileName: UTF8String ): boolean;
186- function LoadTorrentViaDir (const Dir: UTF8String ): boolean;
187- function DecodeTorrentFile (const FileName: UTF8String ): boolean;
185+ function ReadAddTrackerFileFromUser (const FileName: utf8string ): boolean;
186+ function LoadTorrentViaDir (const Dir: utf8string ): boolean;
187+ function DecodeTorrentFile (const FileName: utf8string ): boolean;
188188 procedure UpdateTrackerInsideFileList ;
189189 procedure UpdateTorrentTrackerList ;
190190 procedure ShowTrackerInsideFileList ;
191- function TestConnectionSSL : Boolean ;
191+ function TestConnectionSSL : boolean ;
192192
193193 procedure CheckedOnOffAllTrackers (Value : boolean);
194194 function CopyUserInputNewTrackersToList (Temporary_SkipAnnounceCheck: boolean =
@@ -204,18 +204,19 @@ TFormTrackerModify = class(TForm)
204204
205205implementation
206206
207- uses fphttpclient, LCLIntf, lazutf8, LazFileUtils, trackerlist_online;
207+ uses fphttpclient, LCLIntf, lazutf8, LazFileUtils, trackerlist_online, LCLVersion ;
208208
209209const
210- RECOMENDED_TRACKERS: array [0 ..2 ] of UTF8String =
210+ RECOMENDED_TRACKERS: array [0 ..2 ] of utf8string =
211211 (
212212 ' udp://tracker.coppersurfer.tk:6969/announce' ,
213213 ' udp://tracker.opentrackr.org:1337/announce' ,
214214 ' wss://tracker.openwebtorrent.com'
215215 );
216216
217217 // program name and version (http://semver.org/)
218- FORM_CAPTION = ' Bittorrent tracker editor (1.33.0.beta.6)' ;
218+ FORM_CAPTION = ' Bittorrent tracker editor (1.33.0.beta.6/LCL ' +
219+ lcl_version + ' /FPC ' + { $I %FPCVERSION%} + ' )' ;
219220
220221 GROUPBOX_PRESENT_TRACKERS_CAPTION =
221222 ' Present trackers in all torrent files. Select the one that you want to keep. And added to all torrent files.' ;
@@ -471,7 +472,7 @@ procedure TFormTrackerModify.MenuItemOnlineCheckSubmitNewTrackonClick(Sender: TO
471472
472473procedure TFormTrackerModify.AppendTrackersToMemoNewTrackers (TrackerList: TStringList);
473474var
474- tracker: UTF8String ;
475+ tracker: utf8string ;
475476begin
476477 // Append all the trackers to MemoNewTrackers
477478 MemoNewTrackers.Lines.BeginUpdate;
@@ -521,7 +522,7 @@ procedure TFormTrackerModify.MenuItemOnlineCheckDownloadNewTrackonClick(
521522 end ;
522523end ;
523524
524- function TFormTrackerModify.CheckForAnnounce (const TrackerURL: UTF8String ): boolean;
525+ function TFormTrackerModify.CheckForAnnounce (const TrackerURL: utf8string ): boolean;
525526begin
526527 Result := (not FTrackerList.SkipAnnounceCheck) and
527528 (not WebTorrentTrackerURL(TrackerURL)) and (not FDragAndDropStartUp);
@@ -547,7 +548,7 @@ procedure TFormTrackerModify.ShowUserErrorMessage(const ErrorText: string;
547548end ;
548549
549550function TFormTrackerModify.TrackerWithURLAndAnnounce (
550- const TrackerURL: UTF8String ): boolean;
551+ const TrackerURL: utf8string ): boolean;
551552begin
552553 // Validate the begin of the URL
553554 Result := ValidTrackerURL(TrackerURL);
@@ -874,7 +875,7 @@ procedure TFormTrackerModify.UpdateTorrent;
874875
875876procedure TFormTrackerModify.SaveTrackerFinalListToFile ;
876877var
877- TrackerStr: UTF8String ;
878+ TrackerStr: utf8string ;
878879begin
879880 // Create the tracker text file. The old one will be overwritten
880881 AssignFile(FTrackerFile, FFolderForTrackerListLoadAndSave + FILE_NAME_EXPORT_TRACKERS);
@@ -894,7 +895,7 @@ procedure TFormTrackerModify.SaveTrackerFinalListToFile;
894895
895896procedure TFormTrackerModify.ConsoleModeOrDragAndDropStartupMode ;
896897var
897- FileNameOrDirStr: UTF8String ;
898+ FileNameOrDirStr: utf8string ;
898899 StringList: TStringList;
899900 MustExitWithErrorCode: boolean;
900901begin
@@ -1030,7 +1031,7 @@ procedure TFormTrackerModify.ConsoleModeOrDragAndDropStartupMode;
10301031
10311032procedure TFormTrackerModify.UpdateViewRemoveTracker ;
10321033var
1033- TrackerStr: UTF8String ;
1034+ TrackerStr: utf8string ;
10341035 i: integer;
10351036begin
10361037 {
@@ -1083,7 +1084,7 @@ procedure TFormTrackerModify.UpdateViewRemoveTracker;
10831084
10841085
10851086
1086- function TFormTrackerModify.DecodeTorrentFile (const FileName: UTF8String ): boolean;
1087+ function TFormTrackerModify.DecodeTorrentFile (const FileName: utf8string ): boolean;
10871088begin
10881089 // Called when user add torrent files
10891090 // False if something is wrong with decoding torrent.
@@ -1097,7 +1098,7 @@ function TFormTrackerModify.DecodeTorrentFile(const FileName: UTF8String): boole
10971098
10981099procedure TFormTrackerModify.UpdateTorrentTrackerList ;
10991100var
1100- TrackerStr: UTF8String ;
1101+ TrackerStr: utf8string ;
11011102begin
11021103 // Copy the trackers found in one torrent file to FTrackerList.TrackerFromInsideTorrentFilesList
11031104 for TrackerStr in FDecodePresentTorrent.TrackerList do
@@ -1131,7 +1132,7 @@ procedure TFormTrackerModify.CheckedOnOffAllTrackers(Value: boolean);
11311132function TFormTrackerModify.CopyUserInputNewTrackersToList (
11321133 Temporary_SkipAnnounceCheck: boolean): boolean;
11331134var
1134- TrackerStrLoop, TrackerStr, ErrorStr: UTF8String ;
1135+ TrackerStrLoop, TrackerStr, ErrorStr: utf8string ;
11351136begin
11361137 {
11371138 Called after 'update torrent' is selected.
@@ -1256,7 +1257,7 @@ procedure TFormTrackerModify.LoadTrackersTextFileAddTrackers(
12561257
12571258procedure TFormTrackerModify.LoadTrackersTextFileRemoveTrackers ;
12581259var
1259- filename: UTF8String ;
1260+ filename: utf8string ;
12601261begin
12611262 filename := FFolderForTrackerListLoadAndSave + FILE_NAME_REMOVE_TRACKERS;
12621263 try
@@ -1350,7 +1351,7 @@ procedure TFormTrackerModify.MenuHelpVisitNewTrackonClick(Sender: TObject);
13501351
13511352
13521353function TFormTrackerModify.ReadAddTrackerFileFromUser (
1353- const FileName: UTF8String ): boolean;
1354+ const FileName: utf8string ): boolean;
13541355var
13551356 TrackerFileList: TStringList;
13561357begin
@@ -1436,7 +1437,7 @@ procedure TFormTrackerModify.MenuUpdateTorrentSortClick(Sender: TObject);
14361437
14371438
14381439
1439- function TFormTrackerModify.LoadTorrentViaDir (const Dir: UTF8String ): boolean;
1440+ function TFormTrackerModify.LoadTorrentViaDir (const Dir: utf8string ): boolean;
14401441var
14411442 TorrentFilesNameStringList: TStringList;
14421443begin
@@ -1454,7 +1455,7 @@ function TFormTrackerModify.LoadTorrentViaDir(const Dir: UTF8String): boolean;
14541455
14551456
14561457procedure TFormTrackerModify.FormDropFiles (Sender: TObject;
1457- const FileNames: array of UTF8String );
1458+ const FileNames: array of utf8string );
14581459var
14591460 Count: integer;
14601461 TorrentFileNameStringList, // for the torrent files
@@ -1466,7 +1467,7 @@ procedure TFormTrackerModify.FormDropFiles(Sender: TObject;
14661467 // ViewUpdateBegin must be called one time. Keep track of it.
14671468 ViewUpdateBeginActiveOneTimeOnly: boolean;
14681469
1469- FileNameOrDirStr: UTF8String ;
1470+ FileNameOrDirStr: utf8string ;
14701471begin
14711472 // Drag and drop a folder or files?
14721473
@@ -1598,7 +1599,7 @@ function TFormTrackerModify.AddTorrentFileList(TorrentFileNameStringList:
15981599 // This called from 'add folder' or 'drag and drop'
15991600var
16001601 Count: integer;
1601- TorrentFileNameStr: UTF8String ;
1602+ TorrentFileNameStr: utf8string ;
16021603begin
16031604{ Every torrent file must be decoded for the tracker list inside.
16041605 This torrent tracker list is add to FTrackerList.TrackerFromInsideTorrentFilesList.
@@ -1639,7 +1640,7 @@ function TFormTrackerModify.AddTorrentFileList(TorrentFileNameStringList:
16391640
16401641function TFormTrackerModify.ReloadAllTorrentAndRefreshView : boolean;
16411642var
1642- TorrentFileStr: UTF8String ;
1643+ TorrentFileStr: utf8string ;
16431644begin
16441645{
16451646 This is called after updating the torrent.
@@ -1703,7 +1704,7 @@ procedure TFormTrackerModify.ViewUpdateBegin;
17031704procedure TFormTrackerModify.ViewUpdateOneTorrentFileDecoded ;
17041705var
17051706 RowIndex: integer;
1706- TorrentFileNameStr, PrivateStr: UTF8String ;
1707+ TorrentFileNameStr, PrivateStr: utf8string ;
17071708 DateTimeStr: string;
17081709begin
17091710 // Called after loading torrent file.
@@ -1821,7 +1822,7 @@ procedure TFormTrackerModify.ShowHourGlassCursor(HourGlass: boolean);
18211822
18221823end ;
18231824
1824- function TFormTrackerModify.TestConnectionSSL : Boolean ;
1825+ function TFormTrackerModify.TestConnectionSSL : boolean ;
18251826begin
18261827 Result := ParamCount = 1 ;
18271828 if Result then
@@ -1832,12 +1833,14 @@ function TFormTrackerModify.TestConnectionSSL: Boolean;
18321833 begin
18331834 // Check if there is SLL connection
18341835 try
1835- TFPCustomHTTPClient.SimpleGet(' https://raw.githubusercontent.com/gerryferdinandus/bittorrent-tracker-editor/master/.travis.yml' );
1836+ TFPCustomHTTPClient.SimpleGet(
1837+ ' https://raw.githubusercontent.com/gerryferdinandus/bittorrent-tracker-editor/master/README.md' );
18361838 except
18371839 // No SLL or no internet connection.
18381840 System.ExitCode := 1 ;
18391841 end ;
18401842 end ;
18411843 end ;
18421844end ;
1845+
18431846end .
0 commit comments