Skip to content

Commit

Permalink
Use boolean values in RPC where the specification says so
Browse files Browse the repository at this point in the history
  • Loading branch information
@lighterowl
lighterowl committed Feb 12, 2024
1 parent 1a81ca4 commit a086424
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 55 deletions.
76 changes: 38 additions & 38 deletions daemonoptions.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,19 +160,19 @@ procedure TDaemonOptionsForm.Launch(MainForm: TMainForm; RpcObj: TRpc);
if RpcObj.RPCVersion >= 5 then begin
// RPC version 5
edPort.Value:=args.Integers['peer-port'];
cbPEX.Checked:=args.Integers['pex-enabled'] <> 0;
cbPEX.Checked:=args.Booleans['pex-enabled'];
edMaxPeers.Value:=args.Integers['peer-limit-global'];
edMaxPeersPerTorrent.Value:=args.Integers['peer-limit-per-torrent'];
cbRandomPort.Checked:=args.Integers['peer-port-random-on-start'] <> 0;
cbDHT.Checked:=args.Integers['dht-enabled'] <> 0;
cbSeedRatio.Checked:=args.Integers['seedRatioLimited'] <> 0;
cbRandomPort.Checked:=args.Booleans['peer-port-random-on-start'];
cbDHT.Checked:=args.Booleans['dht-enabled'];
cbSeedRatio.Checked:=args.Booleans['seedRatioLimited'];
edSeedRatio.Value:=args.Floats['seedRatioLimit'];
cbBlocklist.Checked:=args.Integers['blocklist-enabled'] <> 0;
cbBlocklist.Checked:=args.Booleans['blocklist-enabled'];

cbAltEnabled.Checked:=args.Integers['alt-speed-enabled'] <> 0;
cbAltEnabled.Checked:=args.Booleans['alt-speed-enabled'];
edAltDown.Value:=args.Integers['alt-speed-down'];
edAltUp.Value:=args.Integers['alt-speed-up'];
cbAutoAlt.Checked:=args.Integers['alt-speed-time-enabled'] <> 0;
cbAutoAlt.Checked:=args.Booleans['alt-speed-time-enabled'];
edAltTimeBegin.Text:=FormatDateTime('hh:nn', args.Integers['alt-speed-time-begin']/MinsPerDay);
edAltTimeEnd.Text:=FormatDateTime('hh:nn', args.Integers['alt-speed-time-end']/MinsPerDay);
j:=args.Integers['alt-speed-time-day'];
Expand All @@ -199,7 +199,7 @@ procedure TDaemonOptionsForm.Launch(MainForm: TMainForm; RpcObj: TRpc);
end;

if RpcObj.RPCVersion >= 7 then begin
cbIncompleteDir.Checked:=args.Integers['incomplete-dir-enabled'] <> 0;
cbIncompleteDir.Checked:=args.Booleans['incomplete-dir-enabled'];
edIncompleteDir.Text:=UTF8Encode(args.Strings['incomplete-dir']);
cbIncompleteDirClick(nil);
end
Expand All @@ -209,18 +209,18 @@ procedure TDaemonOptionsForm.Launch(MainForm: TMainForm; RpcObj: TRpc);
end;

if RpcObj.RPCVersion >= 8 then
cbPartExt.Checked:=args.Integers['rename-partial-files'] <> 0
cbPartExt.Checked:=args.Booleans['rename-partial-files']
else
cbPartExt.Visible:=False;

if RpcObj.RPCVersion >= 9 then
cbLPD.Checked:=args.Integers['lpd-enabled'] <> 0
cbLPD.Checked:=args.Booleans['lpd-enabled']
else
cbLPD.Visible:=False;

if RpcObj.RPCVersion >= 10 then begin
edCacheSize.Value:=args.Integers['cache-size-mb'];
cbIdleSeedLimit.Checked:=args.Integers['idle-seeding-limit-enabled'] <> 0;
cbIdleSeedLimit.Checked:=args.Booleans['idle-seeding-limit-enabled'];
edIdleSeedLimit.Value:=args.Integers['idle-seeding-limit'];
cbIdleSeedLimitClick(nil);
end
Expand All @@ -243,23 +243,23 @@ procedure TDaemonOptionsForm.Launch(MainForm: TMainForm; RpcObj: TRpc);
cbBlocklistClick(nil);

if RpcObj.RPCVersion >= 13 then
cbUTP.Checked:=args.Integers['utp-enabled'] <> 0
cbUTP.Checked:=args.Booleans['utp-enabled']
else
cbUTP.Visible:=False;

if RpcObj.RPCVersion >= 14 then begin
tabQueue.TabVisible:=True;
cbDownQueue.Checked:=args.Integers['download-queue-enabled'] <> 0;
cbDownQueue.Checked:=args.Booleans['download-queue-enabled'];
edDownQueue.Value:=args.Integers['download-queue-size'];
cbUpQueue.Checked:=args.Integers['seed-queue-enabled'] <> 0;
cbUpQueue.Checked:=args.Booleans['seed-queue-enabled'];
edUpQueue.Value:=args.Integers['seed-queue-size'];
cbStalled.Checked:=args.Integers['queue-stalled-enabled'] <> 0;
cbStalled.Checked:=args.Booleans['queue-stalled-enabled'];
edStalledTime.Value:=args.Integers['queue-stalled-minutes'];
end
else
tabQueue.TabVisible:=False;

cbPortForwarding.Checked:=args.Integers['port-forwarding-enabled'] <> 0;
cbPortForwarding.Checked:=args.Booleans['port-forwarding-enabled'];
s:=args.Strings['encryption'];
if s = 'preferred' then
cbEncryption.ItemIndex:=1
Expand All @@ -268,9 +268,9 @@ procedure TDaemonOptionsForm.Launch(MainForm: TMainForm; RpcObj: TRpc);
cbEncryption.ItemIndex:=2
else
cbEncryption.ItemIndex:=0;
cbMaxDown.Checked:=args.Integers['speed-limit-down-enabled'] <> 0;
cbMaxDown.Checked:=args.Booleans['speed-limit-down-enabled'];
edMaxDown.Value:=args.Integers['speed-limit-down'];
cbMaxUp.Checked:=args.Integers['speed-limit-up-enabled'] <> 0;
cbMaxUp.Checked:=args.Booleans['speed-limit-up-enabled'];
edMaxUp.Value:=args.Integers['speed-limit-up'];
finally
args.Free;
Expand All @@ -296,35 +296,35 @@ procedure TDaemonOptionsForm.Launch(MainForm: TMainForm; RpcObj: TRpc);
req.Add('method', 'session-set');
args:=TJSONObject.Create;
args.Add('download-dir', UTF8Decode(edDownloadDir.Text));
args.Add('port-forwarding-enabled', integer(cbPortForwarding.Checked) and 1);
args.Add('port-forwarding-enabled', cbPortForwarding.Checked);
case cbEncryption.ItemIndex of
1: s:='preferred';
2: s:='required';
else s:='tolerated';
end;
args.Add('encryption', s);
args.Add('speed-limit-down-enabled', integer(cbMaxDown.Checked) and 1);
args.Add('speed-limit-down-enabled', cbMaxDown.Checked);
if cbMaxDown.Checked then
args.Add('speed-limit-down', edMaxDown.Value);
args.Add('speed-limit-up-enabled', integer(cbMaxUp.Checked) and 1);
args.Add('speed-limit-up-enabled', cbMaxUp.Checked);
if cbMaxUp.Checked then
args.Add('speed-limit-up', edMaxUp.Value);
if RpcObj.RPCVersion >= 5 then begin
args.Add('peer-limit-global', edMaxPeers.Value);
args.Add('peer-limit-per-torrent', edMaxPeersPerTorrent.Value);
args.Add('peer-port', edPort.Value);
args.Add('pex-enabled', integer(cbPEX.Checked) and 1);
args.Add('peer-port-random-on-start', integer(cbRandomPort.Checked) and 1);
args.Add('dht-enabled', integer(cbDHT.Checked) and 1);
args.Add('seedRatioLimited', integer(cbSeedRatio.Checked) and 1);
args.Add('pex-enabled', cbPEX.Checked);
args.Add('peer-port-random-on-start', cbRandomPort.Checked);
args.Add('dht-enabled', cbDHT.Checked);
args.Add('seedRatioLimited', cbSeedRatio.Checked);
if cbSeedRatio.Checked then
args.Add('seedRatioLimit', edSeedRatio.Value);
args.Add('blocklist-enabled', integer(cbBlocklist.Checked) and 1);
args.Add('blocklist-enabled', cbBlocklist.Checked);

args.Add('alt-speed-enabled', integer(cbAltEnabled.Checked) and 1);
args.Add('alt-speed-enabled', cbAltEnabled.Checked);
args.Add('alt-speed-down', edAltDown.Value);
args.Add('alt-speed-up', edAltUp.Value);
args.Add('alt-speed-time-enabled', integer(cbAutoAlt.Checked) and 1);
args.Add('alt-speed-time-enabled', cbAutoAlt.Checked);
if cbAutoAlt.Checked then begin
args.Add('alt-speed-time-begin', Round(Frac(StrToTime(edAltTimeBegin.Text))*MinsPerDay));
args.Add('alt-speed-time-end', Round(Frac(StrToTime(edAltTimeEnd.Text))*MinsPerDay));
Expand All @@ -339,33 +339,33 @@ procedure TDaemonOptionsForm.Launch(MainForm: TMainForm; RpcObj: TRpc);
else begin
args.Add('peer-limit', edMaxPeers.Value);
args.Add('port', edPort.Value);
args.Add('pex-allowed', integer(cbPEX.Checked) and 1);
args.Add('pex-allowed', cbPEX.Checked);
end;
if RpcObj.RPCVersion >= 7 then begin
args.Add('incomplete-dir-enabled', integer(cbIncompleteDir.Checked) and 1);
args.Add('incomplete-dir-enabled', cbIncompleteDir.Checked);
if cbIncompleteDir.Checked then
args.Add('incomplete-dir', UTF8Decode(edIncompleteDir.Text));
end;
if RpcObj.RPCVersion >= 8 then
args.Add('rename-partial-files', integer(cbPartExt.Checked) and 1);
args.Add('rename-partial-files', cbPartExt.Checked);
if RpcObj.RPCVersion >= 9 then
args.Add('lpd-enabled', integer(cbLPD.Checked) and 1);
args.Add('lpd-enabled', cbLPD.Checked);
if RpcObj.RPCVersion >= 10 then begin
args.Add('cache-size-mb', edCacheSize.Value);
args.Add('idle-seeding-limit-enabled', integer(cbIdleSeedLimit.Checked) and 1);
args.Add('idle-seeding-limit-enabled', cbIdleSeedLimit.Checked);
args.Add('idle-seeding-limit', edIdleSeedLimit.Value);
end;
if edBlocklistURL.Visible then
if cbBlocklist.Checked then
args.Add('blocklist-url', UTF8Decode(edBlocklistURL.Text));
if RpcObj.RPCVersion >= 13 then
args.Add('utp-enabled', integer(cbUTP.Checked) and 1);
args.Add('utp-enabled', cbUTP.Checked);
if RpcObj.RPCVersion >= 14 then begin
args.Add('download-queue-enabled', integer(cbDownQueue.Checked) and 1);
args.Add('download-queue-enabled', cbDownQueue.Checked);
args.Add('download-queue-size', edDownQueue.Value);
args.Add('seed-queue-enabled', integer(cbUpQueue.Checked) and 1);
args.Add('seed-queue-enabled', cbUpQueue.Checked);
args.Add('seed-queue-size', edUpQueue.Value);
args.Add('queue-stalled-enabled', integer(cbStalled.Checked) and 1);
args.Add('queue-stalled-enabled', cbStalled.Checked);
args.Add('queue-stalled-minutes', edStalledTime.Value);
end;

Expand Down Expand Up @@ -405,7 +405,7 @@ procedure TDaemonOptionsForm.btTestPortClick(Sender: TObject);
if res = nil then
MainForm.CheckStatus(False)
else
if res.Objects['arguments'].Integers['port-is-open'] <> 0 then
if res.Objects['arguments'].Booleans['port-is-open'] then
MessageDlg(sPortTestSuccess, mtInformation, [mbOk], 0)
else
MessageDlg(sPortTestFailed, mtError, [mbOK], 0);
Expand Down
33 changes: 16 additions & 17 deletions main.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2167,7 +2167,7 @@ procedure TMainForm.acMoveTorrentExecute(Sender: TObject);
aids.Add(integer(ids[i]));
args.Add('ids', aids);
args.Add('location', TJSONString.Create(UTF8Decode(edTorrentDir.Text)));
args.Add('move', TJSONIntegerNumber.Create(integer(cbMoveData.Checked) and 1));
args.Add('move', cbMoveData.Checked);
req.Add('arguments', args);
args:=RpcObj.SendRequest(req, False);
args.Free;
Expand Down Expand Up @@ -2348,7 +2348,7 @@ procedure TMainForm.acAltSpeedExecute(Sender: TObject);
try
req.Add('method', 'session-set');
args:=TJSONObject.Create;
args.Add('alt-speed-enabled', integer(not acAltSpeed.Checked) and 1);
args.Add('alt-speed-enabled', not acAltSpeed.Checked);
req.Add('arguments', args);
args:=RpcObj.SendRequest(req, False);
if args = nil then begin
Expand Down Expand Up @@ -2757,7 +2757,7 @@ function TMainForm.DoAddTorrent(const FileName: Utf8String): boolean;
edSearch.Text:='';

args:=TJSONObject.Create;
args.Add('paused', TJSONIntegerNumber.Create(1));
args.Add('paused', True);
i:=Ini.ReadInteger(IniSec, 'PeerLimit', 0);
if i <> 0 then
args.Add('peer-limit', TJSONIntegerNumber.Create(i));
Expand Down Expand Up @@ -2846,7 +2846,7 @@ function TMainForm.DoAddTorrent(const FileName: Utf8String): boolean;
TorrentAction(id, 'torrent-remove');
id:=0;
args:=TJSONObject.Create;
args.Add('paused', TJSONIntegerNumber.Create(1));
args.Add('paused', True);
args.Add('peer-limit', TJSONIntegerNumber.Create(edPeerLimit.Value));
args.Add('download-dir', TJSONString.Create(UTF8Decode(cbDestFolder.Text)));
id:=_AddTorrent(args);
Expand Down Expand Up @@ -4003,16 +4003,16 @@ procedure TMainForm.TorrentProps(PageNo: integer);
if RpcObj.RPCVersion < 5 then
begin
// RPC versions prior to v5
args.Add('speed-limit-down-enabled', integer(cbMaxDown.Checked) and 1);
args.Add('speed-limit-up-enabled', integer(cbMaxUp.Checked) and 1);
args.Add('speed-limit-down-enabled', cbMaxDown.Checked);
args.Add('speed-limit-up-enabled', cbMaxUp.Checked);
if cbMaxDown.Checked then
args.Add('speed-limit-down', edMaxDown.Value);
if cbMaxUp.Checked then
args.Add('speed-limit-up', edMaxUp.Value);
end else begin
// RPC version 5
args.Add('downloadLimited', integer(cbMaxDown.Checked) and 1);
args.Add('uploadLimited', integer(cbMaxUp.Checked) and 1);
args.Add('downloadLimited', cbMaxDown.Checked);
args.Add('uploadLimited', cbMaxUp.Checked);
if cbMaxDown.Checked then
args.Add('downloadLimit', edMaxDown.Value);
if cbMaxUp.Checked then
Expand Down Expand Up @@ -5854,7 +5854,7 @@ procedure TMainForm.FillTorrentsList(list: TJSONArray);
end;

if FieldExists[torcolPrivate] then
FTorrents[torcolPrivate, row]:=t.Integers['isPrivate'];
FTorrents[torcolPrivate, row]:=t.Integers['isPrivate']; { boolean in json, but must be integer in varlist }

if FieldExists[torcolLabels] then begin
a := t.Arrays['labels'];
Expand Down Expand Up @@ -6222,8 +6222,7 @@ procedure TMainForm.InternalRemoveTorrent(const Msg, MsgMulti: string; RemoveLoc
gTorrents.Tag:=0;
end;
args:=TJSONObject.Create;
if RemoveLocalData then
args.Add('delete-local-data', TJSONIntegerNumber.Create(1));
args.Add('delete-local-data', RemoveLocalData);

if TorrentAction(ids, 'torrent-remove', args) then begin
with gTorrents do begin
Expand Down Expand Up @@ -6634,9 +6633,9 @@ procedure TMainForm.FillSessionInfo(s: TJSONObject);
UpdateUIRpcVersion(RpcObj.RPCVersion);

if RpcObj.RPCVersion >= 5 then begin
acAltSpeed.Checked:=s.Integers['alt-speed-enabled'] <> 0;
acUpdateBlocklist.Tag:=s.Integers['blocklist-enabled'];
acUpdateBlocklist.Enabled:=acUpdateBlocklist.Tag <> 0;
acAltSpeed.Checked:=s.Booleans['alt-speed-enabled'];
if s.Booleans['blocklist-enabled'] then acUpdateBlocklist.Tag:=1 else acUpdateBlocklist.Tag:=0;
acUpdateBlocklist.Enabled:=s.Booleans['blocklist-enabled'];
end;
if s.IndexOfName('download-dir-free-space') >= 0 then
StatusBar.Panels[3].Text:=Format(SFreeSpace, [GetHumanSize(s.Floats['download-dir-free-space'])]);
Expand All @@ -6646,11 +6645,11 @@ procedure TMainForm.FillSessionInfo(s: TJSONObject);
u:=s.Integers['alt-speed-up']
end
else begin
if s.Integers['speed-limit-down-enabled'] <> 0 then
if s.Booleans['speed-limit-down-enabled'] then
d:=s.Integers['speed-limit-down']
else
d:=-1;
if s.Integers['speed-limit-up-enabled'] <> 0 then
if s.Booleans['speed-limit-up-enabled'] then
u:=s.Integers['speed-limit-up']
else
u:=-1;
Expand Down Expand Up @@ -7456,7 +7455,7 @@ procedure TMainForm.SetSpeedLimit(const Dir: string; Speed: integer);
args.Add(Format('speed-limit-%s-enabled', [Dir]), integer(Speed >= 0) and 1);
if Speed >= 0 then
args.Add(Format('speed-limit-%s', [Dir]), Speed);
args.Add('alt-speed-enabled', 0);
args.Add('alt-speed-enabled', False);
req.Add('arguments', args);
args:=RpcObj.SendRequest(req, False);
if args = nil then begin
Expand Down

0 comments on commit a086424

Please sign in to comment.