Undo Merge branch 'v5.0.0-dev' into master

Author: Moonbase59

autocue.cue_file.liq

@@ -38,6 +38,7 @@
 # 2024-06-18 - Moonbase59 - v4.0.3 - Changed overlay_longtail from -15 to -12,
 #                           most people seem to want transitions a bit tighter
 # 2024-07-01 - Moonbase59 - v4.0.4 - Sync with cue_file version
+# 2024-07-01 - Moonbase59 - v5.0.0-dev - New JSON API
 
 # Lots of debugging output for AzuraCast in this, will be removed eventually.
 
@@ -51,7 +52,7 @@ let settings.autocue.cue_file.version =
   settings.make(
     description=
       "Software version of autocue.cue_file. Should coincide with `cue_file`.",
-    "4.0.4"
+    "5.0.0-dev"
   )
 
 # Internal only! Not a user setting.

cue_file

@@ -63,13 +63,15 @@
 #                         errors when piping something to cue_file
 #                       - streamline tag conversion code a little
 #                       - only write known tags, not all `liq_*`
+# 2024-07-01 Moonbase59 - v5.0.0-dev
+#                       - New more compatible JSON output
 #
 # Originally based on an idea and some code by John Warburton (@Warblefly):
 #   https://github.com/Warblefly/TrackBoundaries
 # Some collaborative work with RM-FM (@RM-FM): Sustained ending analysis.
 
 __author__ = 'Matthias C. Hormann'
-__version__ = '4.0.4'
+__version__ = '5.0.0-dev'
 
 import os
 import sys
@@ -1254,5 +1256,15 @@ liq_result = {
 }
 
 # output compact (one line) JSON, for use in Liquidsoap "autocue:" protocol
-json_output = json.dumps(liq_result)
+method = "tags" if skip_analysis else "full"
+method = "forced" if args.force else method
+
+json_output = json.dumps(
+    {
+        "apiVersion": __version__,
+        "id": args.file,
+        "method": method,
+        "data": liq_result
+    }
+)
 print(json_output)