From 10ee87bfbb17637923477d1efb626fd793764cfd Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Wed, 21 Sep 2016 15:14:31 +0200
Subject: [PATCH] use DUB convert to get dub JSON from SDL

---
 src/ce_dubproject.pas | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/ce_dubproject.pas b/src/ce_dubproject.pas
index dadeef08..e704eec6 100644
--- a/src/ce_dubproject.pas
+++ b/src/ce_dubproject.pas
@@ -1115,25 +1115,30 @@ begin
     dub.Options := [poUsePipes{$IFDEF WINDOWS}, poNewConsole{$ENDIF}];
     dub.ShowWindow := swoHIDE;
     dub.CurrentDirectory:= filename.extractFilePath;
-    dub.Parameters.Add('describe');
+    dub.Parameters.Add('convert');
+    dub.Parameters.Add('-s');
+    dub.Parameters.Add('-f');
+    dub.Parameters.Add('json');
     dub.Execute;
     processOutputToStrings(dub, str);
     while dub.Running do;
     prs := TJSONParser.Create(str.Text, [joIgnoreTrailingComma, joUTF8]);
     try
-      jsn := prs.Parse;
       try
-        if jsn.isNotNil and (jsn.JSONType = jtObject)
-        and TJSONObject(jsn).Find('packages').isNotNil
-        and (TJSONObject(jsn).Find('packages').JSONType = jtArray)
-        and (TJSONArray(TJSONObject(jsn).Find('packages')).Count > 0)
-        and (TJSONArray(TJSONObject(jsn).Find('packages')).Items[0].JSONType = jtObject) then
-          result := TJSONObject(TJSONArray(TJSONObject(jsn).Find('packages')).Items[0].Clone);
+        jsn := prs.Parse;
+        try
+          if jsn.isNotNil then
+            result := TJSONObject(jsn.Clone)
+          else
+            result := nil;
+        finally
+          jsn.free;
+        end;
       finally
-        jsn.free;
+        prs.Free
       end;
-    finally
-      prs.Free
+    except
+      result := nil;
     end;
   finally
     SetCurrentDirUTF8(old);