Better messages

sync.py

@@ -63,6 +63,10 @@ def execute(shell_command):
         return None
 
 
+def group_name(full_path):
+    return os.path.basename(full_path).split('.')[0]
+
+
 def parse_video_files(usb_dir, base_dir, extension, fake=False):
     files = {}
     for file in os.listdir(os.path.join(usb_dir, base_dir)):
@@ -86,20 +90,21 @@ def join_video_files(dest, sources):
         ffmpeg_line = 'ffmpeg -safe 0 -f concat -i %s -c copy %s' % (list_file, dest)
         output = execute(ffmpeg_line)
     if output != None:
-        logger.info('Removing source files')
+        logger.info(f'{group_name(dest)}: removing source files...')
         for s_file in sources:
             os.remove(s_file)
+        logger.info(f'{group_name(dest)}: removed source files')
         return True
     return False
 
 
 def encoder(q, config, file_groups):
     for file_group, files in file_groups:
-        logger.info(f"Joining {file_group}")
+        logger.info(f"{file_group}: joining...")
         outfile_name = '%s.mp4' % file_group
         outfile_path = os.path.join(config.destination, outfile_name)
         if join_video_files(outfile_path, files):
-            logger.info(f"Joined {file_group}")
+            logger.info(f"{file_group}: joined")
             q.put(outfile_path)
     q.put(None)
 
@@ -109,12 +114,13 @@ def uploader(q, config):
         file_group = q.get()
         if file_group is None:
             break
-        logger.info(f"Uploading {file_group}")
+        logger.info(f"{group_name(dest)}: uploading...")
         output = execute('ncftpput -u %s -p %s %s %s %s' % (config.ftp_user, config.ftp_password, config.ftp_host, config.ftp_path, file_group))
         if output != None:
-            logger.info('Removing %s', file_group)
+            logger.info(f"{group_name(dest)}: uploaded")
+            logger.info(f"{group_name(dest)}: removing...")
             os.remove(file_group)
-        logger.info(f"Uploaded {file_group}")
+            logger.info(f"{group_name(dest)}: removed")
 
 
 def plugged_in(dev, config):