Skip to content

Commit 8d84ac0

Browse files
committed
add FIREFLY_URL environment variable as default, change single quotes
1 parent 1906995 commit 8d84ac0

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

examples/filetable.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,34 +15,34 @@ def filetable_to_firefly(ffclient, topdir, pattern, recursive=True):
1515
ffclient: firefly_client.FireflyClient
1616
Instance of FireflyClient connected to a Firefly server
1717
18-
topdir: 'str'
18+
topdir: "str"
1919
pathname for directory to search
2020
21-
pattern: 'str'
22-
filename pattern to search for, e.g. '*.fits'
21+
pattern: "str"
22+
filename pattern to search for, e.g. "*.fits"
2323
2424
recursive: `bool`
2525
Search all subdirectories recursively (default=True)
2626
2727
Returns:
2828
--------
29-
tbl_val: 'str'
29+
tbl_val: "str"
3030
Descriptor of table that was uploaded to the Firefly server
3131
3232
metadict: `dict`
3333
Dictionary of metadata items
3434
3535
"""
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",
3939
delete=False,
40-
suffix='.csv') as fd:
40+
suffix=".csv") as fd:
4141
csv_writer = csv.writer(fd)
42-
csv_writer.writerow(['number','name','path'])
42+
csv_writer.writerow(["number","name","path"])
4343
for i, path in enumerate(filelist):
4444
csv_writer.writerow([i, os.path.basename(path),
45-
'file://'+path])
45+
"file://"+path])
4646

4747
tbl_val = ffclient.upload_file(fd.name)
4848
os.remove(fd.name)
@@ -55,16 +55,16 @@ def main():
5555
parser = argparse.ArgumentParser(description="""
5656
Display a table of files in a Firefly window
5757
""")
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",
6565
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")
6868

6969
args = parser.parse_args()
7070
topdir = args.topdir
@@ -89,7 +89,7 @@ def main():
8989
r = fc.add_cell(0, 0, 1, 2, "tables", "main")
9090
fc.show_table(tbl_val, meta=metainfo)
9191
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"])
9393

9494
if __name__ == "__main__":
9595
main()

0 commit comments

Comments
 (0)