Re-added logging options to core module for -v output

Author: arkrow

Diff for: pymusiclooper/__main__.py

@@ -31,7 +31,7 @@
 def loop_track(filename, min_duration_multiplier):
     try:
         # Load the file
-        logging.info("Loading {}...".format(filename))
+        print("Loading {}...".format(filename))
 
         track = MusicLooper(filename, min_duration_multiplier)
 
@@ -155,10 +155,10 @@ def bounded_float(x):
         warnings.filterwarnings("ignore")
         logging.basicConfig(level=logging.ERROR)
     elif args.verbose:
+        logging.basicConfig(level=logging.INFO)
+    else:
         warnings.filterwarnings("ignore")
         logging.basicConfig(level=logging.ERROR)
-    else:
-        logging.basicConfig(level=logging.INFO)
 
     output_dir = args.output_dir
 

Diff for: pymusiclooper/core.py

@@ -18,6 +18,8 @@
 
 import json
 import os
+import time
+import logging
 
 import librosa
 import numpy as np
@@ -74,6 +76,8 @@ def db_diff(self, power_db_f1, power_db_f2):
         return average_diff
 
     def find_loop_pairs(self, combine_beat_plp=False, concurrency=False):
+        runtime_start = time.time()
+
         S = librosa.core.stft(y=self.audio)
         S_power = np.abs(S) ** 2
         S_weighed = librosa.core.perceptual_weighting(
@@ -84,19 +88,28 @@ def find_loop_pairs(self, combine_beat_plp=False, concurrency=False):
         bpm, beats = librosa.beat.beat_track(onset_envelope=onset_env)
 
         beats = np.sort(beats)
+        logging.info("Detected {} beats at {:.0f} bpm".format(beats.size, bpm))
 
         chroma = librosa.feature.chroma_stft(S=S_power)
 
         power_db = librosa.power_to_db(mel_spectrogram, ref=np.max)
         min_duration = int(chroma.shape[-1] * self.min_duration_multiplier)
 
+        runtime_end = time.time()
+        prep_time = runtime_end - runtime_start
+        logging.info("Finished initial prep in {:.3}s".format(prep_time))
+
         def loop_subroutine(combine_beat_plp=combine_beat_plp, beats=beats):
             if combine_beat_plp:
                 onset_env = librosa.onset.onset_strength(S=mel_spectrogram)
                 pulse = librosa.beat.plp(onset_envelope=onset_env)
                 beats_plp = np.flatnonzero(librosa.util.localmax(pulse))
                 beats = np.union1d(beats, beats_plp)
-
+                logging.info(
+                    "Detected {} total points by combining PLP with existing beats".format(
+                        beats.size
+                    )
+                )
             candidate_pairs = []
 
             self._loop_finding_routine(
@@ -156,6 +169,9 @@ def loop_subroutine(combine_beat_plp=combine_beat_plp, beats=beats):
                 break
 
         if retry and not combine_beat_plp:
+            logging.info(
+                "No suitable loop points found with current parameters. Retrying with additional beat points from PLP method."
+            )
             pruned_list = loop_subroutine(combine_beat_plp=True)
 
         if self.trim_offset[0] > 0:
@@ -167,6 +183,8 @@ def loop_subroutine(combine_beat_plp=combine_beat_plp, beats=beats):
                     pruned_list[i]["loop_end"]
                 )
 
+        logging.info(f"Found {len(pruned_list)} possible loop points")
+
         return pruned_list
 
     def apply_trim_offset(self, frame):