Making Combatable with python3

collect-fingerprints-of-songs.py

@@ -30,33 +30,33 @@
         colored('channels=%d', 'white', attrs=['dark']), # channels
         colored('%s', 'white', attrs=['bold'])           # filename
       )
-      print msg % (song_id, len(audio['channels']), filename)
+      print (msg % (song_id, len(audio['channels']), filename))
 
       if song:
         hash_count = db.get_song_hashes_count(song_id)
 
         if hash_count > 0:
           msg = '   already exists (%d hashes), skip' % hash_count
-          print colored(msg, 'red')
+          print (colored(msg, 'red'))
 
           continue
 
-      print colored('   new song, going to analyze..', 'green')
+      print (colored('   new song, going to analyze..', 'green'))
 
       hashes = set()
       channel_amount = len(audio['channels'])
 
       for channeln, channel in enumerate(audio['channels']):
         msg = '   fingerprinting channel %d/%d'
-        print colored(msg, attrs=['dark']) % (channeln+1, channel_amount)
+        print (colored(msg, attrs=['dark']) % (channeln+1, channel_amount))
 
         channel_hashes = fingerprint.fingerprint(channel, Fs=audio['Fs'], plots=config['fingerprint.show_plots'])
         channel_hashes = set(channel_hashes)
 
         msg = '   finished channel %d/%d, got %d hashes'
-        print colored(msg, attrs=['dark']) % (
+        print (colored(msg, attrs=['dark']) % (
           channeln+1, channel_amount, len(channel_hashes)
-        )
+        ))
 
         hashes |= channel_hashes
 
@@ -67,7 +67,7 @@
         values.append((song_id, hash, offset))
 
       msg = '   storing %d hashes in db' % len(values)
-      print colored(msg, 'green')
+      print (colored(msg, 'green'))
 
       db.store_fingerprints(values)
 

config-development.sample.json

@@ -1,8 +1,6 @@
 {
   "env": "development",
-
-  // you can use any of cloud-based or local mongo servers
-  // like https://mlab.com/
+
   "db.dsn": "mongodb://user:password@cloud-domain:port/",
   "db.database": "database-name-here"
 }

get-database-stat.py

@@ -15,7 +15,7 @@ def printSummary():
     colored('%d song(s)', 'yellow'),        # songs
     colored('%d fingerprint(s)', 'yellow')  # fingerprints
   )
-  print msg % row
+  print (msg % row)
 
   return row[0] # total
 
@@ -36,7 +36,7 @@ def printSongs():
       colored('%s', 'white', attrs=['bold']),   # name
       colored('%d hashes', 'green')             # hashes
     )
-    print msg % row
+    print (msg % row)
 
 # find duplicates
 def printDuplicates():
@@ -54,15 +54,15 @@ def printDuplicates():
   """)
 
   msg = ' * duplications: %s' % colored('%d song(s)', 'yellow')
-  print msg % len(rows)
+  print (msg % len(rows))
 
   for row in rows:
     msg = '   ** %s %s: %s' % (
       colored('id=%s','white',attrs=['dark']),
       colored('%s', 'white', attrs=['bold']),
       colored('%d duplicate(s)', 'red')
     )
-    print msg % row
+    print (msg % row)
 
 # find colissions
 def printColissions():
@@ -82,19 +82,19 @@ def printColissions():
   if rows[0][0] is not None:
     val = rows[0]
 
-  print msg % val
+  print (msg % val)
 
 if __name__ == '__main__':
   db = SqliteDatabase()
-  print ''
+  print ('')
 
   x = printSummary()
   printSongs()
-  if x: print ''
+  if x: print ('')
 
   printDuplicates()
-  if x: print ''
+  if x: print ('')
 
   printColissions()
 
-  print '\ndone'
+  print ('\ndone')

libs/fingerprint.py

@@ -95,7 +95,7 @@ def fingerprint(channel_samples, Fs=DEFAULT_FS,
     local_maxima = get_2D_peaks(arr2D, plot=plots, amp_min=amp_min)
 
     msg = '   local_maxima: %d of frequency & time pairs'
-    print colored(msg, attrs=['dark']) % len(local_maxima)
+    print (colored(msg, attrs=['dark']) % len(local_maxima))
 
     # return hashes
     return generate_hashes(local_maxima, fan_value=fan_value)

reset-database.py

@@ -8,7 +8,7 @@
   # songs table
 
   db.query("DROP TABLE IF EXISTS songs;")
-  print('removed db.songs');
+  print('removed db.songs')
 
   db.query("""
     CREATE TABLE songs (
@@ -17,13 +17,13 @@
       filehash  TEXT
     );
   """)
-  print('created db.songs');
+  print('created db.songs')
 
   #
   # fingerprints table
 
   db.query("DROP TABLE IF EXISTS fingerprints;")
-  print('removed db.fingerprints');
+  print('removed db.fingerprints')
 
   db.query("""
     CREATE TABLE `fingerprints` (
@@ -33,6 +33,6 @@
       `offset`  INTEGER
     );
   """)
-  print('created db.fingerprints');
+  print('created db.fingerprints')
 
-  print('done');
+  print('done')