batch process update iss799

batch.py

@@ -50,8 +50,6 @@ Options:
                         help="tmp folder. Default: ./tmp/")
     parser.add_argument("-u", "--supinfolder", default="./supplements",
                         help="Input folder with sample solutions. Default: ./supplements")
-    parser.add_argument("-v", "--supoutfolder", default="./supplements_out",
-                        help="output folder containing watermarked sample solutions. Default: ./supplements_out")
     parser.add_argument("-w", "--sup", default="0",
                         help="Flag for watermarking sample solutions. 0 means no 1 means yes. Default: 0")
 
@@ -65,7 +63,6 @@ Options:
     tmp = args.tmp
     password = args.password
     sup = int(args.sup)
-    supoutfolder = args.supoutfolder
     supinfolder = args.supinfolder
 
     starttime = time.time()
@@ -77,8 +74,11 @@ Options:
     watermark.main(['--in', infolder, '--out', watermark_outfolder,
                     '--cores', cores, '--dpi', dpi])
     if sup == 1:
+        supoutfolder = os.path.join(tmp, 'supplements_out')
+        if not os.path.exists(supoutfolder):
+            os.makedirs(supoutfolder)
         supplements.main(['--in', supinfolder, '--out', supoutfolder])
-        watermark.main(['--in', supinfolder, '--out', watermark_outfolder,
+        watermark.main(['--in', supoutfolder, '--out', watermark_outfolder,
                     '--cores', cores, '--dpi', dpi])
 
     # Encryption