Updating and correcting SonicPI Synths

FoxDot/lib/Extensions/SonicPi/__init__.py

@@ -84,7 +84,7 @@ def _load_synths(data, create_filename):
 def LoadSonicPiSynthsDev(sonic_pi_dir):
     """ Load the sonic pi synths from a live sonic-pi repo """
     synthinfo = os.path.join(sonic_pi_dir,
-                             'app/server/sonicpi/lib/sonicpi/synths/synthinfo')
+                             'app/server/ruby/lib/sonicpi/synths/synthinfo')
     datastr = check_output(["ruby", RUBY_SCRIPT, synthinfo])
     data = json.loads(datastr)
     _load_synths(
@@ -112,10 +112,10 @@ def create_filename(fullname):
 def GenerateSonicPiData(sonic_pi_dir):
     """ Generate the sonic-pi json metadata from a sonic-pi source repo """
     synthinfo = os.path.join(sonic_pi_dir,
-                             'app/server/sonicpi/lib/sonicpi/synths/synthinfo')
+                             'app/server/ruby/lib/sonicpi/synths/synthinfo')
     datastr = check_output(["ruby", RUBY_SCRIPT, synthinfo])
     ref = check_output(["git", "rev-parse", "HEAD"], cwd=sonic_pi_dir).strip()
     data = json.loads(datastr)
-    data['__ref__'] = ref
+    data['__ref__'] = ref.decode()
     with open(SONIC_PI_FILE, 'w') as ofile:
         json.dump(data, ofile, separators=(',', ':'))

FoxDot/lib/Extensions/SonicPi/generate_sonic_pi.py

@@ -1,4 +1,4 @@
-from FoxDot.lib.Custom.SonicPi import GenerateSonicPiData
+from FoxDot.lib.Extensions.SonicPi import GenerateSonicPiData
 
 if __name__ == '__main__':
     import sys

FoxDot/lib/ServerManager.py

@@ -531,7 +531,10 @@ def get_bundle(self, synthdef, packet, timestamp=0):
         this_bus  = self.nextbusID()
         this_node = self.nextnodeID()
 
-        # synthdef.preprocess_osc(packet) # so far, just "balance" to multiply amp by 1
+        try:
+            synthdef.preprocess_osc(packet) # so far, just "balance" to multiply amp by 1
+        except:
+            pass
 
         # First node of the group (control rate)