Plugin useragent can be redefined via UserAgent config key

pozitronik · Apr 5, 2020 · 97a7602 · 97a7602
1 parent 9c0ad3c
commit 97a7602
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/CMLHTTP.pas b/CMLHTTP.pas
@@ -124,7 +124,7 @@ constructor TCloudMailRuHTTP.Create(Settings: TConnectionSettings; ExternalProgr
 		self.Throttle.SendBitsPerSec := Settings.UploadBPS;
 	end;
 
-	HTTP.Request.UserAgent := 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.162 Safari/537.36/TCWFX(' + PlatformX + ')';
+	HTTP.Request.UserAgent := Settings.UserAgent;
 	HTTP.Request.Connection := EmptyWideStr;
 end;
 

diff --git a/CMLTypes.pas b/CMLTypes.pas
@@ -3,12 +3,6 @@
 interface
 
 const
-{$IFDEF WIN64}
-	PlatformX = 'x64';
-{$ENDIF}
-{$IFDEF WIN32}
-	PlatformX = 'x32';
-{$ENDIF}
 	PUBLIC_ACCESS_URL = 'https://cloud.mail.ru/public/';
 	OAUTH_TOKEN_URL = 'https://o2.mail.ru/token';
 	TOKEN_URL = 'https://cloud.mail.ru/?from=promo&from=authpopup';

diff --git a/Settings.pas b/Settings.pas
@@ -5,6 +5,12 @@ interface
 uses Classes, Windows, SysUtils, IniFiles, System.Variants, System.IOUtils, Plugin_Types, MRC_Helper, VCL.Controls, System.RegularExpressions;
 
 const
+{$IFDEF WIN64}
+	PlatformX = 'x64';
+{$ENDIF}
+{$IFDEF WIN32}
+	PlatformX = 'x32';
+{$ENDIF}
 	ProxyNone = 0;
 	ProxySocks5 = 1;
 	ProxySocks4 = 2;
@@ -59,6 +65,8 @@ interface
 
 	StreamingPrefix = 'Streaming:';
 
+	DEFAULT_USERAGENT = 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.162 Safari/537.36/TCWFX(' + PlatformX + ')';
+
 type
 	{Account-related options set}
 	TAccountSettings = record
@@ -94,6 +102,7 @@ 	TConnectionSettings = record
 		SocketTimeout: integer;
 		UploadBPS: integer;
 		DownloadBPS: integer;
+		UserAgent: WideString;
 	end;
 
 	{Global plugin options}
@@ -215,6 +224,7 @@ function GetPluginSettings(IniFilePath: WideString): TPluginSettings;
 	GetPluginSettings.ConnectionSettings.ProxySettings.user := IniFile.ReadString('Main', 'ProxyUser', EmptyWideStr);
 	GetPluginSettings.ConnectionSettings.ProxySettings.use_tc_password_manager := IniFile.ReadBool('Main', 'ProxyTCPwdMngr', false);
 	GetPluginSettings.ConnectionSettings.ProxySettings.password := IniFile.ReadString('Main', 'ProxyPassword', EmptyWideStr);
+	GetPluginSettings.ConnectionSettings.UserAgent := IniFile.ReadString('Main', 'UserAgent', DEFAULT_USERAGENT);
 	GetPluginSettings.DownloadLinksEncode := IniFile.ReadBool('Main', 'DownloadLinksEncode', true);
 	GetPluginSettings.AutoUpdateDownloadListing := IniFile.ReadBool('Main', 'AutoUpdateDownloadListing', true);
 	GetPluginSettings.ShowTrashFolders := IniFile.ReadBool('Main', 'ShowTrashFolders', true);