Merge pull request #5 from kkoz/bulk-annotations-and-streaming

Bulk annotations and streaming

CHANGES.rst

@@ -1,6 +1,13 @@
 CHANGES
 =======
 
+0.3.0
+-----
+
+* Added bulk annotations for Projects and Datasets
+* Changed csv parsing to proceed line-by-line (streaming)
+
+
 0.2.2
 -----
 

src/omero_cli_metadata.py

@@ -476,20 +476,20 @@ def populate(self, args):
                 cfgid = cfgann.getFile().getId()
                 md.linkAnnotation(cfgann)
 
-        # Note some contexts only support a subset of these args
-        ctx = context_class(client, args.obj, file=args.file, fileid=fileid,
-                            cfg=args.cfg, cfgid=cfgid, attach=args.attach,
-                            options=localcfg)
-        ctx.parse()
+        loops = 0
+        ms = 0
         if not args.dry_run:
             wait = args.wait
-            if not wait:
-                loops = 0
-                ms = 0
-            else:
+            if wait:
                 ms = 5000
                 loops = int((wait * 1000) / ms) + 1
-            ctx.write_to_omero(batch_size=args.batch, loops=loops, ms=ms)
+
+        # Note some contexts only support a subset of these args
+        ctx = context_class(client, args.obj, file=args.file, fileid=fileid,
+                            cfg=args.cfg, cfgid=cfgid, attach=args.attach,
+                            options=localcfg, batch_size=args.batch,
+                            loops=loops, ms=ms)
+        ctx.parse()
 
     def rois(self, args):
         "Manage ROIs"