json-check: use min.json

dwg: support .min.json
json: support -m

Author: rurban

NEWS

@@ -4,6 +4,11 @@ See the end for copying conditions.
 
 LibreDWG version 0.13.1 - 2023-02-10 - beta:
 
+Minor features:
+  * dwgread now supports --fmt=minJSON or --file=XXX.min.json
+    to emit minimized json without whitespace. Use eg.
+      jq . XXX.min.json
+    to unminimize it. Saves about 50% size.
 Minor bugfixes:
   * Fixed DXF XRECORD xdata values and sizes (wrong binary encoding in outdxf,
     wrong xdata_size in indxf)
@@ -15,6 +20,8 @@ Minor bugfixes:
   * Change DIMSTYLE.DIMTXTDIRECTION dxf code from 295 to 294. (#835)
     Undocumented, ODA has it as 295, netDXF as 294. on indxf accept both.
   * Fix encode ERROR: Wrong object size on MS adjust on large objects.
+  * Fix encode downconvert_DIMSTYLE, when the eed already had one
+    member, AcadAnnotative.
 
 LibreDWG version 0.13 - 2023-02-04 - beta:
 

dwg.in

@@ -90,14 +90,41 @@ for d in "$@"; do
         if [ "$dir" = "_." ]; then dir=""; fi
         if [ -z "$ext" ]; then
             case $(basename "$d") in
-            *.dwg) ext=dwg ;;
-            *.DWG) ext=dwg ;;
-            *.dxf) ext=dxf ;;
-            *.DXF) ext=dxf ;;
-            *.dxfb) ext=dxfb ;;
-            *.DXFB) ext=dxfb ;;
-            *.json) ext=json ;;
-            *.JSON) ext=json ;;
+            *.dwg)
+                ext=dwg
+                b=$(basename "$d" ".$ext")
+                ;;
+            *.DWG)
+                ext=dwg
+                b=$(basename "$d" .DWG)
+                ;;
+            *.dxf)
+                ext=dxf
+                b=$(basename "$d" ".$ext")
+                ;;
+            *.DXF)
+                ext=dxf
+                b=$(basename "$d" .DXF)
+                ;;
+            *.dxfb)
+                ext=dxfb
+                b=$(basename "$d" ".$ext")
+                ;;
+            *.DXFB)
+                ext=dxfb
+                b=$(basename "$d" .DXFB)
+                ;;
+            *.min.json)
+                b=$(basename "$d" .min.json)
+                ext=json ;;
+            *.json)
+                ext=json
+                b=$(basename "$d" ".$ext")
+                ;;
+            *.JSON)
+                ext=json
+                b=$(basename "$d" .JSON)
+                ;;
             *)
                 if [ "$(head -c1 "$d")" = "{" ]; then
                     ext=json
@@ -112,10 +139,10 @@ for d in "$@"; do
                     echo "Illegal extension for $d"
                     exit
                 fi
+                b=$(basename "$d" ."$ext")
                 ;;
             esac
         fi
-        b=$(basename "$d" ."$ext")
         log="$b$dir.$ext.log"
         out="$b$dir.dwg"
         ori_timeout="$timeout"

json-check

@@ -46,12 +46,12 @@ esac
 
 # first create a dwg log to compare against
 # ./log "$v" "$d"
-rm "./$b.log" "./$b.json" "./$b.dwg" 2>/dev/null
-if ! ./json "-l$b.log" "$v" "$d"; then
+rm "./$b.log" "./$b.min.json" "./$b.dwg" 2>/dev/null
+if ! ./json -m "-l$b.log" "$v" "$d"; then
     exit 2
 fi
-if [ -f "$b.json" ]; then
-    if ! ./dwg -y "$v" "$b.json"; then
+if [ -f "$b.min.json" ]; then
+    if ! ./dwg -y "$v" "$b.min.json"; then
         exit 1
     fi
 fi

json.in

@@ -33,9 +33,13 @@ ob="$b"
 ext=
 gerr=0
 log=
+jext="json"
 
 for d in "$@"; do
     case $d in
+    -m)
+        jext="min.json"
+        ;;
     -v*)
         v="$d"
         ;;
@@ -97,10 +101,10 @@ for d in "$@"; do
         if [ -z "$log" ]; then
             log="$b$dir.log"
         fi
-        out="$b$dir.json"
-        echo "$timeout $TESTPROG programs/dwgread $v -Ojson -o $out $d 2>$log"
+        out="$b$dir.$jext"
+        echo "$timeout $TESTPROG programs/dwgread $v -o $out $d 2>$log"
         # shellcheck disable=SC2086
-        $timeout $TESTPROG programs/dwgread "$v" -Ojson -o "$out" "$d" 2>"$log"
+        $timeout $TESTPROG programs/dwgread "$v" -o "$out" "$d" 2>"$log"
         err=$?
         [ $err -gt $gerr ] && gerr=$err
         tail -n2 "$log"