add parsing empty arguments for symbols/types.

It uses: all, wildcard
dxFeed · Oct 24, 2023 · 90a1133 · 90a1133
1 parent ed02e27
commit 90a1133
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 8 deletions.
diff --git a/DXFeedFramework.xcodeproj/xcshareddata/xcschemes/Tools.xcscheme b/DXFeedFramework.xcodeproj/xcshareddata/xcschemes/Tools.xcscheme
@@ -89,6 +89,10 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "Dump tapeK2.tape[speed=max] all all -t ios_tapeK2.tape -q"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "Dump tapeK2.tape[speed=max] -t ios_tapeK2.tape -q"
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument

diff --git a/Samples/PerfTestCL/Arguments.swift b/Samples/PerfTestCL/Arguments.swift
@@ -14,6 +14,7 @@ enum ArgumentParserException: Error {
 
 class Arguments {
     private let allParameters: [String]
+    private let namelessParameters: [String]
 
     public lazy var properties: [String: String] = {
         var properties = [String: String]()
@@ -62,27 +63,42 @@ Cmd \(cmd) contains not enough \(cmd.count - 1) arguments. Expected \(requiredNu
         }
         // 0 Arg is path to executed app
         self.allParameters =  Array(cmd[1..<cmd.count])
+        if let firstNamedParameter = cmd.firstIndex(where: { str in
+            str.hasPrefix("-")
+        }) {
+            self.namelessParameters = Array(cmd[1..<firstNamedParameter])
+        } else {
+            self.namelessParameters = self.allParameters
+        }
     }
 
     public subscript(index: Int) -> String {
-        allParameters[index]
+        namelessParameters[index]
     }
 
     public var count: Int {
-        allParameters.count
+        namelessParameters.count
     }
 
     public func parseTypes(at index: Int) -> [EventCode] {
-        if allParameters[2] == "all" {
+        if namelessParameters.count <= index {
+            return EventCode.allCases
+        }
+
+        if namelessParameters[2] == "all" {
             return EventCode.allCases
         }
-        return allParameters[2].split(separator: ",").compactMap { str in
+        return namelessParameters[2].split(separator: ",").compactMap { str in
             return EventCode(string: String(str))
         }
     }
 
     public func parseSymbols(at index: Int) -> [Symbol] {
-        let symbols = allParameters[index]
+        if namelessParameters.count <= index {
+            return [WildcardSymbol.all]
+        }
+
+        let symbols = namelessParameters[index]
         if symbols.lowercased() == "all" {
             return [WildcardSymbol.all]
         }

diff --git a/Samples/PerfTestCL/DumpTool.swift b/Samples/PerfTestCL/DumpTool.swift
@@ -25,12 +25,19 @@ class DumpTool: ToolsCommand {
     Where:
     <address>  is a URL to Schedule API defaults file
     <types>    is comma-separated list of dxfeed event types ({eventTypeNames}).
+               If <types> is not specified, creates a subscription for all available event types.
     <symbol>   is comma-separated list of symbol names to get events for (e.g. ""IBM,AAPL,MSFT"").
-              for Candle event specify symbol with aggregation like in ""AAPL{{=d}}""
+               for Candle event specify symbol with aggregation like in ""AAPL{{=d}}""
+               If <symbol> is not specified, the wildcard symbol is used.
+    Usage:
+        Dump <address> [<options>]
+        Dump <address> <types> [<options>]
+        Dump <address> <types> <symbols> [<options>]
 
-    sample: Dump demo.dxfeed.com:7300 quote AAPL,IBM,ETH/USD:GDAX -t "tape_test.txt[format=text]"
+    Sample: Dump demo.dxfeed.com:7300 quote AAPL,IBM,ETH/USD:GDAX -t "tape_test.txt[format=text]"
+    Sample: Dump tapeK2.tape[speed=max] all all -q -t ios_tapeK2.tape
+    Sample: Dump tapeK2.tape[speed=max] -q -t ios_tapeK2.tape
 
-    sample: Dump tapeK2.tape[speed=max] all all -q -t ios_tapeK2.tape
     """
     var publisher: DXPublisher?
     var isQuite = false