Fix lib examples not showing sketches with .pde files

Author: silvanocerza

arduino/libraries/loader.go

@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/arduino/arduino-cli/arduino/sketches"
 	"github.com/arduino/go-paths-helper"
 	properties "github.com/arduino/go-properties-orderedmap"
 	"github.com/pkg/errors"
@@ -172,7 +173,8 @@ func addExamplesToPathList(examplesPath *paths.Path, list *paths.PathList) error
 		return err
 	}
 	for _, file := range files {
-		if isExample(file) {
+		_, err := sketches.NewSketchFromPath(file)
+		if err == nil {
 			list.Add(file)
 		} else if file.IsDir() {
 			if err := addExamplesToPathList(file, list); err != nil {
@@ -182,9 +184,3 @@ func addExamplesToPathList(examplesPath *paths.Path, list *paths.PathList) error
 	}
 	return nil
 }
-
-// isExample returns true if examplePath contains an example
-func isExample(examplePath *paths.Path) bool {
-	mainIno := examplePath.Join(examplePath.Base() + ".ino")
-	return mainIno.Exist() && mainIno.IsNotDir()
-}

test/test_lib.py

@@ -621,3 +621,36 @@ def test_install_with_zip_path_multiple_libraries(run_command, downloads_dir, da
     # Verifies library are installed
     assert wifi_install_dir.exists()
     assert ble_install_dir.exists()
+
+
+def test_lib_examples(run_command, data_dir):
+    assert run_command("update")
+
+    assert run_command("lib install Arduino_JSON@0.1.0")
+
+    res = run_command("lib examples Arduino_JSON --format json")
+    assert res.ok
+    data = json.loads(res.stdout)
+    assert len(data) == 1
+    examples = data[0]["examples"]
+
+    assert str(Path(data_dir, "libraries", "Arduino_JSON", "examples", "JSONArray")) in examples
+    assert str(Path(data_dir, "libraries", "Arduino_JSON", "examples", "JSONKitchenSink")) in examples
+    assert str(Path(data_dir, "libraries", "Arduino_JSON", "examples", "JSONObject")) in examples
+
+
+def test_lib_examples_with_pde_file(run_command, data_dir):
+    assert run_command("update")
+
+    assert run_command("lib install Encoder@1.4.1")
+
+    res = run_command("lib examples Encoder --format json")
+    assert res.ok
+    data = json.loads(res.stdout)
+    assert len(data) == 1
+    examples = data[0]["examples"]
+
+    assert str(Path(data_dir, "libraries", "Encoder", "examples", "Basic")) in examples
+    assert str(Path(data_dir, "libraries", "Encoder", "examples", "NoInterrupts")) in examples
+    assert str(Path(data_dir, "libraries", "Encoder", "examples", "SpeedTest")) in examples
+    assert str(Path(data_dir, "libraries", "Encoder", "examples", "TwoKnobs")) in examples