Skip to content

Commit 080fd76

Browse files
committed
First cut: Find scripts in base script directory
1 parent 113c617 commit 080fd76

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/main/java/org/scijava/script/ScriptFinder.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141

4242
import org.scijava.AbstractContextual;
4343
import org.scijava.Context;
44+
import org.scijava.MenuEntry;
4445
import org.scijava.MenuPath;
4546
import org.scijava.log.LogService;
4647
import org.scijava.plugin.Parameter;
@@ -179,7 +180,9 @@ private int createInfos(final List<ScriptInfo> scripts, final Set<URL> urls,
179180
// menuPath = File > Import > Movie File...
180181

181182
// NB: Ignore base-level scripts (not nested in any menu).
182-
if (menuPath.size() == 1) continue;
183+
if (menuPath.size() == 1){
184+
menuPath.add(0, new MenuEntry("Scripts"));
185+
}
183186

184187
final URL url = scriptMap.get(path);
185188

src/test/java/org/scijava/script/ScriptFinderTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public class ScriptFinderTest {
6666
public static void setUp() throws IOException {
6767
scriptsDir = TestUtils.createTemporaryDirectory("script-finder-");
6868
final String[] scriptPaths = { //
69-
"ignored.foo", //
69+
"script_in_base_dir.foo", //
7070
"Scripts/quick.foo", //
7171
"Scripts/brown.foo", //
7272
"Scripts/fox.foo", //
@@ -108,6 +108,7 @@ public void testFindScripts() {
108108
"Math > multiply", //
109109
"Math > pow", //
110110
"Scripts > quick", //
111+
"Scripts > script in base dir", //
111112
"Math > Trig > sin", //
112113
"Math > subtract", //
113114
"Math > Trig > tan", //
@@ -139,10 +140,10 @@ public void testMenuPrefixes() {
139140
"Foo > Bar > Math > Trig > cos", //
140141
"Foo > Bar > Math > divide", //
141142
"Foo > Bar > Scripts > fox", //
142-
"Foo > Bar > ignored", //
143143
"Foo > Bar > Math > multiply", //
144144
"Math > pow", //
145145
"Foo > Bar > Scripts > quick", //
146+
"Foo > Bar > script in base dir", //
146147
"Foo > Bar > Math > Trig > sin", //
147148
"Foo > Bar > Math > subtract", //
148149
"Foo > Bar > Math > Trig > tan", //
@@ -177,6 +178,7 @@ public void testOverlappingDirectories() {
177178
"Math > multiply", //
178179
"Math > pow", //
179180
"Plugins > quick", //
181+
"Scripts > script in base dir", //
180182
"Math > Trig > sin", //
181183
"Math > subtract", //
182184
"Math > Trig > tan", //

0 commit comments

Comments
 (0)