cmdz

1 files changed, 8 insertions, 5 deletions

diff --git a/live-mogrify.py b/live-mogrify.py
index 24ec198..3cb61c4 100644
--- a/live-mogrify.py
+++ b/live-mogrify.py
@@ -190,17 +190,18 @@ class Listener():
     if cmd == 'load_epoch':
       name, epoch = payload.split(':')
       print(">>> loading checkpoint {}, epoch {}".format(name, epoch))
-      self.data_opt.checkpoint = name
+      self.data_opt.checkpoint_name = name
       self.data_opt.epoch = epoch
       self.data_opt.load_checkpoint = True
       return 'ok'
     if cmd == 'load_sequence' and os.path.exists('./sequences/' + payload):
+      print('load sequence: {}'.format(payload))
       self.data_opt.sequence_name = payload
       self.data_opt.load_sequence = True
     if cmd == 'get_status':
       return {
         'processing': self.data_opt.processing,
-        'checkpoint': self.data_opt.checkpoint,
+        'checkpoint': self.data_opt.checkpoint_name,
         'epoch': self.data_opt.epoch,
         'sequence': self.data_opt.sequence_name,
       }
@@ -247,7 +248,7 @@ def process_live_input(opt, data_opt, rpc_client, model):
     if i >= opt.how_many:
       break
     if data_opt.load_checkpoint is True:
-      model.save_dir = os.path.join(opt.checkpoints_dir, data_opt.checkpoint)
+      model.save_dir = os.path.join(opt.checkpoints_dir, data_opt.checkpoint_name)
       model.load_network(model.netG, 'G', data_opt.epoch)
       data_opt.load_checkpoint = False
     if data_opt.load_sequence is True:
@@ -340,9 +341,11 @@ def process_live_input(opt, data_opt, rpc_client, model):
     if data_opt.pause:
       data_opt.pause = False
       break
-    sequence_i += 1
-    if sequence_i >= len(sequence):
+    if sequence_i >= len(sequence)-1:
+      print('(((( sequence looped ))))')
       sequence_i = 1
+    else:
+      sequence_i += 1
   data_opt.processing = False
 
 if __name__ == '__main__':