jgtfx2console 0.4.25__py3-none-any.whl → 0.4.27__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- jgtfx2console/LiveChartDataExport.py +5 -2
- jgtfx2console/__init__.py +1 -1
- jgtfx2console/config_generator.py +6 -6
- {jgtfx2console-0.4.25.dist-info → jgtfx2console-0.4.27.dist-info}/METADATA +1 -1
- {jgtfx2console-0.4.25.dist-info → jgtfx2console-0.4.27.dist-info}/RECORD +9 -9
- {jgtfx2console-0.4.25.dist-info → jgtfx2console-0.4.27.dist-info}/LICENSE +0 -0
- {jgtfx2console-0.4.25.dist-info → jgtfx2console-0.4.27.dist-info}/WHEEL +0 -0
- {jgtfx2console-0.4.25.dist-info → jgtfx2console-0.4.27.dist-info}/entry_points.txt +0 -0
- {jgtfx2console-0.4.25.dist-info → jgtfx2console-0.4.27.dist-info}/top_level.txt +0 -0
@@ -232,11 +232,14 @@ def parse_xml(config_file):
|
|
232
232
|
if output_dir == '' or output_dir is None or output_dir=='0':
|
233
233
|
output_dir = os.getenv('JGTPY_DATA') or jgtconf.get('JGTPY_DATA')
|
234
234
|
dt_separator = find_in_tree(settings, "DateTimeSeparator").text
|
235
|
+
|
236
|
+
if dt_separator == '' or dt_separator is None:
|
237
|
+
dt_separator = ' '
|
235
238
|
fdp = find_in_tree(settings, "FormatDecimalPlaces").text
|
236
239
|
tzone = find_in_tree(settings, "Timezone").text
|
237
240
|
|
238
241
|
if tzone != 'EST' and tzone != 'UTC' and tzone != 'Local':
|
239
|
-
print('Timezone is not recognized, using
|
242
|
+
print('Timezone is not recognized, using UTC')
|
240
243
|
tzone = 'UTC' #Default timezone
|
241
244
|
|
242
245
|
print("=============================")
|
@@ -245,7 +248,7 @@ def parse_xml(config_file):
|
|
245
248
|
print("Connection: " + str_connection)
|
246
249
|
#print("Session ID: " + str_session_id)
|
247
250
|
#print("Pin: " + str_pin)
|
248
|
-
print("Delimiter: " + delim)
|
251
|
+
#print("Delimiter: " + delim)
|
249
252
|
print("Output Directory: " + output_dir)
|
250
253
|
print("DateTime Separator: " + dt_separator)
|
251
254
|
print("Format Decimal Places: " + fdp)
|
jgtfx2console/__init__.py
CHANGED
@@ -25,7 +25,7 @@ def generate_config(instruments, timeframes, nb_bar=500, default_headers="DateTi
|
|
25
25
|
ET.SubElement(settings, 'SessionID').text = ''
|
26
26
|
ET.SubElement(settings, 'Pin').text = ''
|
27
27
|
ET.SubElement(settings, 'Delimiter').text = ','
|
28
|
-
ET.SubElement(settings, 'DateTimeSeparator').text = '
|
28
|
+
ET.SubElement(settings, 'DateTimeSeparator').text = ' '
|
29
29
|
ET.SubElement(settings, 'FormatDecimalPlaces').text = 'Y'
|
30
30
|
ET.SubElement(settings, 'Timezone').text = 'UTC'
|
31
31
|
|
@@ -46,13 +46,13 @@ def generate_config(instruments, timeframes, nb_bar=500, default_headers="DateTi
|
|
46
46
|
def main():
|
47
47
|
import argparse
|
48
48
|
parser = argparse.ArgumentParser(description='Generate a configuration file for the ptoLiveChartDataExport')
|
49
|
-
parser.add_argument('--instruments', help='The list of instruments to export (comma-separated)')
|
50
|
-
parser.add_argument('--timeframes', help='The list of timeframes to export (comma-separated)')
|
51
|
-
parser.add_argument('--outxml', type=str,default="jgtfxliveconfig.xml", help='Output XML file')
|
49
|
+
parser.add_argument('-i','--instruments', help='The list of instruments to export (comma-separated)')
|
50
|
+
parser.add_argument('-t','--timeframes', help='The list of timeframes to export (comma-separated)')
|
51
|
+
parser.add_argument('-o','--outxml', type=str,default="jgtfxliveconfig.xml", help='Output XML file')
|
52
52
|
|
53
53
|
#data_dir = os.getenv('JGTPY_DATA') or if --data_dir
|
54
|
-
parser.add_argument('--data_dir', help='The directory where the data will be saved')
|
55
|
-
|
54
|
+
parser.add_argument('-d','--data_dir', help='The directory where the data will be saved')
|
55
|
+
|
56
56
|
|
57
57
|
|
58
58
|
args = parser.parse_args()
|
@@ -1,6 +1,6 @@
|
|
1
|
-
jgtfx2console/LiveChartDataExport.py,sha256=
|
2
|
-
jgtfx2console/__init__.py,sha256=
|
3
|
-
jgtfx2console/config_generator.py,sha256=
|
1
|
+
jgtfx2console/LiveChartDataExport.py,sha256=9-P0ArVGsxlR1KntzoUv9JhKIxRr08cQ2Cghb2-nKfk,15282
|
2
|
+
jgtfx2console/__init__.py,sha256=CLV_QIlfUCohmqMnFNP2vc3BXPcPLVxVlnRdKYWClfo,1611
|
3
|
+
jgtfx2console/config_generator.py,sha256=P9QpCYh87WqhN1ctilkHOUBjMgW1CrEAGLNcLSs9MGQ,2849
|
4
4
|
jgtfx2console/fxcli2console.py,sha256=oI4d01jkXNriP2tF8aHcdep_r2YORWMfSnysrIHEAqQ,7426
|
5
5
|
jgtfx2console/forexconnect/EachRowListener.py,sha256=jbRaSqhHtoaRnEnLGoUmVLvE6VPt-WXYtglRPzK440k,1649
|
6
6
|
jgtfx2console/forexconnect/ForexConnect.py,sha256=Yf6AcLdgMSD8rd1s2DTIJPfzJ7BljIaZy_8vTfPfSOI,25755
|
@@ -31,9 +31,9 @@ jgtfx2console/forexconnect/lib/linux/libpython3.7m.so,sha256=UQzwU5QcaVnwQdt2yXi
|
|
31
31
|
jgtfx2console/forexconnect/lib/linux/libquotesmgr2.so.2.8,sha256=QIUMvjI-4m3YX3N23Pad9TIhYbmk17raTTW0gyrElkM,1245248
|
32
32
|
jgtfx2console/forexconnect/lib/linux/libsqlite3.8.so,sha256=aqjV6ZcluDkzyr_bbWQCOHt9uitLvp7uPS-53Z3toQk,641120
|
33
33
|
jgtfx2console/forexconnect/lib/linux/requirements.txt,sha256=62zntle4oq_jlsvrAK1bbfgYvAcRPtVHkGYu_eWiRZs,77
|
34
|
-
jgtfx2console-0.4.
|
35
|
-
jgtfx2console-0.4.
|
36
|
-
jgtfx2console-0.4.
|
37
|
-
jgtfx2console-0.4.
|
38
|
-
jgtfx2console-0.4.
|
39
|
-
jgtfx2console-0.4.
|
34
|
+
jgtfx2console-0.4.27.dist-info/LICENSE,sha256=uCA_HysYVK9qIMbDEFjcDYhCoKTg19AJhKhM71EKSGA,1086
|
35
|
+
jgtfx2console-0.4.27.dist-info/METADATA,sha256=K6j8msUIxU9E71vBUvLpE6c-I9wUS5_7hHoyYsFh-NY,2201
|
36
|
+
jgtfx2console-0.4.27.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
|
37
|
+
jgtfx2console-0.4.27.dist-info/entry_points.txt,sha256=5-2VwwmwQtOqI0d2qvq3Lupgu9sUVe8S6zOYf-9whQ4,164
|
38
|
+
jgtfx2console-0.4.27.dist-info/top_level.txt,sha256=PBNCBgqX42I7ctUTX9FcTnIX0utvgRqzuflefzZ30D8,14
|
39
|
+
jgtfx2console-0.4.27.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|