Merge pull request #385 from DropSnorz/fix/reaper-parser-quote

DropSnorz · web-flow · commit 7825845f0501 · 2025-10-20T21:40:05.000+02:00
Remove quotes in parsed reaper plugin name
diff --git a/owlplug-parsers/src/main/java/com/owlplug/parsers/reaper/PluginNodeListener.java b/owlplug-parsers/src/main/java/com/owlplug/parsers/reaper/PluginNodeListener.java
@@ -50,18 +50,21 @@ public void enterNode(ReaperProjectParser.NodeContext ctx) {
     }
 
     ReaperPlugin plugin = new ReaperPlugin();
+
+    // Extract first node positional parameter (name)
     if (ctx.value().size() > 0) {
       plugin.setName(ctx.value(0).getText().replaceAll("\"", ""));
     }
+    // Extract second node positional parameter (filename)
     if (ctx.value().size() > 1) {
-      plugin.setFilename(ctx.value(1).getText());
+      plugin.setFilename(ctx.value(1).getText().replaceAll("\"", ""));
     }
+    // Extract fifth node positional parameter (rawId)
     if (ctx.value().size() > 4) {
       plugin.setRawId(ctx.value(4).getText());
     }
     reaperPlugins.add(plugin);
 
-
   }
 
   @Override
diff --git a/owlplug-parsers/src/test/java/com/owlplug/parsers/reaper/ReaperProjectGrammarTest.java b/owlplug-parsers/src/test/java/com/owlplug/parsers/reaper/ReaperProjectGrammarTest.java
@@ -70,7 +70,9 @@ public void parseReaper7File() throws IOException {
 
     assertEquals(2, pluginListener.getReaperPlugins().size());
     assertEquals("VST3i: Tunefish4 (Brain Control)", pluginListener.getReaperPlugins().get(0).getName());
+    assertEquals("Tunefish4.vst3", pluginListener.getReaperPlugins().get(0).getFilename());
     assertEquals("VSTi: Dexed (Digital Suburban)", pluginListener.getReaperPlugins().get(1).getName());
+    assertEquals("Dexed_x64-with space.dll", pluginListener.getReaperPlugins().get(1).getFilename());
 
   }
 
@@ -94,6 +96,8 @@ public void parseAdvancedReaperFile() throws IOException {
 
     assertEquals(2, pluginListener.getReaperPlugins().size());
     assertEquals("VST: ReaComp (Cockos)", pluginListener.getReaperPlugins().get(0).getName());
+    assertEquals("reacomp.dll", pluginListener.getReaperPlugins().get(0).getFilename());
     assertEquals("VSTi: ReaSynth (Cockos)", pluginListener.getReaperPlugins().get(1).getName());
+    assertEquals("reasynth.dll", pluginListener.getReaperPlugins().get(1).getFilename());
   }
 }
diff --git a/owlplug-parsers/src/test/resources/reaper/reaper7.rpp b/owlplug-parsers/src/test/resources/reaper/reaper7.rpp
@@ -202,7 +202,7 @@
       LASTSEL 0
       DOCKED 0
       BYPASS 0 0 0
-      <VST "VSTi: Dexed (Digital Suburban)" Dexed_x64.dll 0 "" 1147500644<56535444657864646578656400000000> ""
+      <VST "VSTi: Dexed (Digital Suburban)" "Dexed_x64-with space.dll" 0 "" 1147500644<56535444657864646578656400000000> ""
         ZHhlRO5e7f4AAAAAAgAAAAEAAAAAAAAAAgAAAAAAAACWFwAAAQAAAAAAEAA=
         VkMyIY0XAAA8ZGV4ZWRTdGF0ZSBjdXRvZmY9IjEuMDAwMDAwMDAwMDAwMDAwMDAwMDAiIHJlc289IjAuMDAwMDAwMDAwMDAwMDAwMDAwMDAiIGdhaW49IjEuMDAwMDAw
         MDAwMDAwMDAwMDAwMDAiIGN1cnJlbnRQcm9ncmFtPSIwIiBtb25vTW9kZT0iMCIgZW5naW5lVHlwZT0iMSIgbWFzdGVyVHVuZT0iMCIgb3BTd2l0Y2g9IjExMTExMSIg
diff --git a/owlplug-parsers/src/test/resources/reaper/simpleReaperFile.rpp b/owlplug-parsers/src/test/resources/reaper/simpleReaperFile.rpp
@@ -3,7 +3,7 @@
   ATTRIBUTE3 0 -1
   ATTRIBUTE4 0 1 1
   <NODE2
-  ATTRIBUTE 1 "test1" "test2"
+  ATTRIBUTE 1 test1 "test2" "test with spaces"
   >
   LANEHEIGHT 0 0
   ARM 0

Original file line number	Diff line number	Diff line change
`@@ -50,18 +50,21 @@ public void enterNode(ReaperProjectParser.NodeContext ctx) {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`ReaperPlugin plugin = new ReaperPlugin();`
	`53`	`+`
	`54`	`+ // Extract first node positional parameter (name)`
`53`	`55`	`if (ctx.value().size() > 0) {`
`54`	`56`	`plugin.setName(ctx.value(0).getText().replaceAll("\"", ""));`
`55`	`57`	`}`
	`58`	`+ // Extract second node positional parameter (filename)`
`56`	`59`	`if (ctx.value().size() > 1) {`
`57`		`- plugin.setFilename(ctx.value(1).getText());`
	`60`	`+ plugin.setFilename(ctx.value(1).getText().replaceAll("\"", ""));`
`58`	`61`	`}`
	`62`	`+ // Extract fifth node positional parameter (rawId)`
`59`	`63`	`if (ctx.value().size() > 4) {`
`60`	`64`	`plugin.setRawId(ctx.value(4).getText());`
`61`	`65`	`}`
`62`	`66`	`reaperPlugins.add(plugin);`
`63`	`67`
`64`		`-`
`65`	`68`	`}`
`66`	`69`
`67`	`70`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,9 @@ public void parseReaper7File() throws IOException {`
`70`	`70`
`71`	`71`	`assertEquals(2, pluginListener.getReaperPlugins().size());`
`72`	`72`	`assertEquals("VST3i: Tunefish4 (Brain Control)", pluginListener.getReaperPlugins().get(0).getName());`
	`73`	`+ assertEquals("Tunefish4.vst3", pluginListener.getReaperPlugins().get(0).getFilename());`
`73`	`74`	`assertEquals("VSTi: Dexed (Digital Suburban)", pluginListener.getReaperPlugins().get(1).getName());`
	`75`	`+ assertEquals("Dexed_x64-with space.dll", pluginListener.getReaperPlugins().get(1).getFilename());`
`74`	`76`
`75`	`77`	`}`
`76`	`78`
`@@ -94,6 +96,8 @@ public void parseAdvancedReaperFile() throws IOException {`
`94`	`96`
`95`	`97`	`assertEquals(2, pluginListener.getReaperPlugins().size());`
`96`	`98`	`assertEquals("VST: ReaComp (Cockos)", pluginListener.getReaperPlugins().get(0).getName());`
	`99`	`+ assertEquals("reacomp.dll", pluginListener.getReaperPlugins().get(0).getFilename());`
`97`	`100`	`assertEquals("VSTi: ReaSynth (Cockos)", pluginListener.getReaperPlugins().get(1).getName());`
	`101`	`+ assertEquals("reasynth.dll", pluginListener.getReaperPlugins().get(1).getFilename());`
`98`	`102`	`}`
`99`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`ATTRIBUTE3 0 -1`
`4`	`4`	`ATTRIBUTE4 0 1 1`
`5`	`5`	`<NODE2`
`6`		`- ATTRIBUTE 1 "test1" "test2"`
	`6`	`+ ATTRIBUTE 1 test1 "test2" "test with spaces"`
`7`	`7`	`>`
`8`	`8`	`LANEHEIGHT 0 0`
`9`	`9`	`ARM 0`