blob: 7321ec82299bcab8867f0a767262b788caf1f9b3 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
--- rpc.pas 2019-10-12 00:52:07.000000000 -0500
+++ rpc.pas 2021-01-06 18:48:06.854420000 -0500
@@ -805,21 +805,32 @@
req, args: TJSONObject;
_fields: TJSONArray;
i: integer;
+ sl: TStringList;
begin
Result:=nil;
req:=TJSONObject.Create;
+ sl:=TStringList.Create;
try
req.Add('method', 'torrent-get');
args:=TJSONObject.Create;
if TorrentId <> 0 then
args.Add('ids', TJSONArray.Create([TorrentId]));
- _fields:=TJSONArray.Create(Fields);
- for i:=Low(ExtraFields) to High(ExtraFields) do
- _fields.Add(ExtraFields[i]);
+ _fields:=TJSONArray.Create;
+ for i:=Low(Fields) to High(Fields) do
+ if (Fields[i].VType=vtAnsiString) then
+ sl.Add(String(Fields[i].VAnsiString));
+ sl.AddStrings(ExtraFields);
+ sl.Sort;
+ for i:=sl.Count-2 downto 0 do
+ if (sl[i]=sl[i+1]) then
+ sl.Delete(i+1);
+ for i:=0 to sl.Count-1 do
+ _fields.Add(sl[i]);
args.Add('fields', _fields);
req.Add('arguments', args);
Result:=SendRequest(req);
finally
+ sl.Free;
req.Free;
end;
end;
|
