server support for nested map directory

2 files changed, 4 insertions, 13 deletions

diff --git a/server/src/bin/graph.rs b/server/src/bin/graph.rs
index 7019de9c..0bc3702f 100644
--- a/server/src/bin/graph.rs
+++ b/server/src/bin/graph.rs
@@ -15,7 +15,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 */
-use anyhow::{anyhow, Result};
+use anyhow::Result;
 use hurrycurry_protocol::{Demand, ItemIndex, Recipe, RecipeIndex};
 use hurrycurry_server::data::DataIndex;
 
@@ -26,12 +26,7 @@ async fn main() -> Result<()> {
 
     println!("digraph {{");
 
-    let rn = std::env::args()
-        .nth(1)
-        .ok_or(anyhow!("first arg should be recipe set name"))?;
-
-    let (data, _, _) = index.generate(format!("5star-{rn}")).await?;
-
+    let (data, _, _) = index.generate("5star").await?;
     for i in 0..data.item_names.len() {
         println!("i{i} [label=\"{}\"]", data.item_name(ItemIndex(i)))
     }
diff --git a/server/src/bin/graph_summary.rs b/server/src/bin/graph_summary.rs
index 12df0b1a..2c97799a 100644
--- a/server/src/bin/graph_summary.rs
+++ b/server/src/bin/graph_summary.rs
@@ -15,7 +15,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 */
-use anyhow::{anyhow, Result};
+use anyhow::Result;
 use hurrycurry_protocol::{ItemIndex, Recipe, TileIndex};
 use hurrycurry_server::data::DataIndex;
 use std::collections::HashSet;
@@ -27,11 +27,7 @@ async fn main() -> Result<()> {
 
     println!("digraph {{");
 
-    let rn = std::env::args()
-        .nth(1)
-        .ok_or(anyhow!("first arg should be recipe set name"))?;
-
-    let (data, sdata, _) = index.generate(format!("5star-{rn}")).await?;
+    let (data, sdata, _) = index.generate("5star").await?;
 
     struct Node {
         inputs: Vec<ItemIndex>,