@@ -15,34 +15,34 @@ def filetable_to_firefly(ffclient, topdir, pattern, recursive=True):
15
15
ffclient: firefly_client.FireflyClient
16
16
Instance of FireflyClient connected to a Firefly server
17
17
18
- topdir: ' str'
18
+ topdir: " str"
19
19
pathname for directory to search
20
20
21
- pattern: ' str'
22
- filename pattern to search for, e.g. ' *.fits'
21
+ pattern: " str"
22
+ filename pattern to search for, e.g. " *.fits"
23
23
24
24
recursive: `bool`
25
25
Search all subdirectories recursively (default=True)
26
26
27
27
Returns:
28
28
--------
29
- tbl_val: ' str'
29
+ tbl_val: " str"
30
30
Descriptor of table that was uploaded to the Firefly server
31
31
32
32
metadict: `dict`
33
33
Dictionary of metadata items
34
34
35
35
"""
36
- filelist = glob (topdir + ' /**/' + pattern , recursive = recursive )
37
- metadict = {' datasource' : ' path' }
38
- with tempfile .NamedTemporaryFile (mode = ' w+t' ,
36
+ filelist = glob (topdir + " /**/" + pattern , recursive = recursive )
37
+ metadict = {" datasource" : " path" }
38
+ with tempfile .NamedTemporaryFile (mode = " w+t" ,
39
39
delete = False ,
40
- suffix = ' .csv' ) as fd :
40
+ suffix = " .csv" ) as fd :
41
41
csv_writer = csv .writer (fd )
42
- csv_writer .writerow ([' number' , ' name' , ' path' ])
42
+ csv_writer .writerow ([" number" , " name" , " path" ])
43
43
for i , path in enumerate (filelist ):
44
44
csv_writer .writerow ([i , os .path .basename (path ),
45
- ' file://' + path ])
45
+ " file://" + path ])
46
46
47
47
tbl_val = ffclient .upload_file (fd .name )
48
48
os .remove (fd .name )
@@ -55,16 +55,16 @@ def main():
55
55
parser = argparse .ArgumentParser (description = """
56
56
Display a table of files in a Firefly window
57
57
""" )
58
- parser .add_argument (' topdir' , help = ' top-level directory to search' )
59
- parser .add_argument (' pattern' , help = ' filename pattern for search' )
60
- parser .add_argument (' --norecursion' , help = ' do not recursively search topdir' ,
61
- action = ' store_true' )
62
- parser .add_argument (' --firefly_url' , help = ' URL for Firefly server' ,
63
- default = 'https://irsa.ipac.caltech.edu/irsaviewer' )
64
- parser .add_argument (' --channel' , help = ' channel name for websocket' ,
58
+ parser .add_argument (" topdir" , help = " top-level directory to search" )
59
+ parser .add_argument (" pattern" , help = " filename pattern for search" )
60
+ parser .add_argument (" --norecursion" , help = " do not recursively search topdir" ,
61
+ action = " store_true" )
62
+ parser .add_argument (" --firefly_url" , help = " URL for Firefly server" ,
63
+ default = os . getenv ( "FIREFLY_URL" ) )
64
+ parser .add_argument (" --channel" , help = " channel name for websocket" ,
65
65
default = None )
66
- parser .add_argument (' --printurl' , help = ' print browser url instead of' +
67
- ' attempting to launch browser' , action = ' store_true' )
66
+ parser .add_argument (" --printurl" , help = " print browser url instead of" +
67
+ " attempting to launch browser" , action = " store_true" )
68
68
69
69
args = parser .parse_args ()
70
70
topdir = args .topdir
@@ -89,7 +89,7 @@ def main():
89
89
r = fc .add_cell (0 , 0 , 1 , 2 , "tables" , "main" )
90
90
fc .show_table (tbl_val , meta = metainfo )
91
91
r = fc .add_cell (0 , 1 , 1 , 2 , "tableImageMeta" , "image-meta" )
92
- fc .show_image_metadata (viewer_id = r [' cell_id' ])
92
+ fc .show_image_metadata (viewer_id = r [" cell_id" ])
93
93
94
94
if __name__ == "__main__" :
95
95
main ()
0 commit comments