1 files changed, 39 insertions, 30 deletions
diff --git a/test-mogrify.py b/test-mogrify.py
index 6b61f62..f7c1e50 100644
--- a/test-mogrify.py
+++ b/test-mogrify.py
@@ -15,6 +15,7 @@ import numpy as np
 import cv2
 from datetime import datetime
 import re
+import sys
 
 import subprocess
 from time import sleep
@@ -28,27 +29,19 @@ if __name__ == '__main__':
   opt.no_flip = True  # no flip
   # opt.experiment = data_opt.experiment # opt.start_img.split("/")[-1].split(".")[0]
 
-  d = datetime.now()
-  tag = "{}_{}_{}".format(
-      opt.name, opt.experiment,
-      d.strftime('%Y%m%d%H%M'))
-
-  opt.tag = tag # = "pcfade___201805150250"
+  if opt.tag == '':
+    d = datetime.now()
+    tag = opt.tag = "{}_{}_{}".format(
+      opt.name,
+      opt.experiment,
+      d.strftime('%Y%m%d%H%M')
+    )
 
   opt.render_dir = render_dir = opt.results_dir + opt.name + "/" + tag + "/"
   A_offset = 0
   A_im = None
   A_dir = None
 
-  print("create render_dir: {}".format(render_dir))
-  if os.path.exists(render_dir):
-      rmtree(render_dir)
-  mkdirs(render_dir)
-
-  # cmd = ("convert", opt.start_img, '-canny', '0x1+10%+30%', render_dir + "frame_00000.png")
-  # process = subprocess.Popen(cmd, stdout=subprocess.PIPE)
-  # output, error = process.communicate()
-
   def load_first_frame():
     start_img_path = os.path.join(render_dir, "frame_00000.png")
     if data_opt.just_copy:
@@ -107,6 +100,36 @@ if __name__ == '__main__':
 
     return img
 
+  def render_video():
+    print(opt.render_dir)
+    video_fn = tag + "_mogrify.mp4"
+
+    cmd = ("ffmpeg", "-i", render_dir + "ren_%05d.png", "-y", "-c:v", "libx264", "-vf", "fps=30", "-pix_fmt", "yuv420p", "-s", "456x256", render_dir + video_fn)
+    process = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+    output, error = process.communicate()
+
+    print("________")
+
+    cmd = ("scp", render_dir + video_fn, "jules@asdf.us:asdf/neural/")
+    process = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+    output, error = process.communicate()
+
+    print("https://asdf.us/neural/" + video_fn)
+
+
+  if data_opt.mov:
+    render_video()
+    sys.exit(1)
+  else:
+    print("create render_dir: {}".format(render_dir))
+    if os.path.exists(render_dir):
+        rmtree(render_dir)
+    mkdirs(render_dir)
+
+  # cmd = ("convert", opt.start_img, '-canny', '0x1+10%+30%', render_dir + "frame_00000.png")
+  # process = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+  # output, error = process.communicate()
+
   if data_opt.sequence:
     frac_a = data_opt.recursive_frac
     frac_b = data_opt.sequence_frac
@@ -201,18 +224,4 @@ if __name__ == '__main__':
 
   # os.remove(render_dir + "frame_00000.png")
 
-  print(opt.render_dir)
-  video_fn = tag + "_mogrify.mp4"
-
-  cmd = ("ffmpeg", "-i", render_dir + "ren_%05d.png", "-y", "-c:v", "libx264", "-vf", "fps=30", "-pix_fmt", "yuv420p", "-s", "456x256", render_dir + video_fn)
-  process = subprocess.Popen(cmd, stdout=subprocess.PIPE)
-  output, error = process.communicate()
-
-  print("________")
-
-  cmd = ("scp", render_dir + video_fn, "jules@asdf.us:asdf/neural/")
-  process = subprocess.Popen(cmd, stdout=subprocess.PIPE)
-  output, error = process.communicate()
-
-  print("https://asdf.us/neural/" + video_fn)
-
+  render_video()