Makefile

@@ -1,4 +1,10 @@
 
+all: test bin
+
+test: kifu-core/test-oneshot sgf/test-oneshot
+
+bin: kifu-gtk 
+
 changeset-dev:
 	cd changeset && make dev
 
@@ -58,3 +64,6 @@ kifu-pwa/dev:
 
 kifu-pwa/server:
 	pushd kifu/pwa && make server
+
+sgf/test-oneshot:
+	pushd sgf && make test-oneshot

kifu/core/Cargo.lock

@@ -120,17 +120,6 @@ dependencies = [
  "syn 2.0.12",
 ]
 
-[[package]]
-name = "go-sgf"
-version = "0.1.0"
-dependencies = [
- "chrono",
- "nom",
- "serde",
- "thiserror",
- "typeshare",
-]
-
 [[package]]
 name = "grid"
 version = "0.9.0"
@@ -191,10 +180,10 @@ version = "0.1.0"
 dependencies = [
  "chrono",
  "cool_asserts",
- "go-sgf",
  "grid",
  "serde",
  "serde_json",
+ "sgf",
  "thiserror",
  "typeshare",
 ]
@@ -337,6 +326,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "sgf"
+version = "0.1.0"
+dependencies = [
+ "chrono",
+ "nom",
+ "serde",
+ "thiserror",
+ "typeshare",
+]
+
 [[package]]
 name = "syn"
 version = "1.0.109"

kifu/core/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 chrono          = { version = "0.4" }
-go-sgf          = { path = "../../go-sgf" }
+sgf             = { path = "../../sgf" }
 grid            = { version = "0.9" }
 serde_json      = { version = "1" }
 serde           = { version = "1", features = [ "derive" ] }

kifu/core/src/database.rs

@@ -1,6 +1,6 @@
 use std::{ffi::OsStr, io::Read, os::unix::ffi::OsStrExt, path::PathBuf};
 
-use go_sgf::{parse_sgf, GameTree};
+use sgf::{parse_sgf, GameTree};
 use thiserror::Error;
 
 #[derive(Error, Debug)]
@@ -63,7 +63,7 @@ impl Database {
 mod test {
     use super::*;
     use cool_asserts::assert_matches;
-    use go_sgf::{Date, GameType};
+    use sgf::{Date, GameType};
 
     #[test]
     fn it_reads_empty_database() {

kifu/core/src/ui/elements/game_preview.rs

@@ -1,5 +1,5 @@
-use go_sgf::{Date, GameTree, Rank};
 use serde::{Deserialize, Serialize};
+use sgf::{Date, GameTree, Rank};
 use typeshare::typeshare;
 
 #[derive(Clone, Debug, Deserialize, Serialize)]

kifu/core/src/ui/home.rs

@@ -1,6 +1,6 @@
 use crate::ui::{Action, GamePreviewElement};
-use go_sgf::GameTree;
 use serde::{Deserialize, Serialize};
+use sgf::GameTree;
 use typeshare::typeshare;
 
 fn rank_strings() -> Vec<String> {

kifu/gtk/Cargo.lock

@@ -545,17 +545,6 @@ dependencies = [
  "system-deps",
 ]
 
-[[package]]
-name = "go-sgf"
-version = "0.1.0"
-dependencies = [
- "chrono",
- "nom",
- "serde",
- "thiserror",
- "typeshare",
-]
-
 [[package]]
 name = "gobject-sys"
 version = "0.17.4"
@@ -799,10 +788,10 @@ name = "kifu-core"
 version = "0.1.0"
 dependencies = [
  "chrono",
- "go-sgf",
  "grid",
  "serde",
  "serde_json",
+ "sgf",
  "thiserror",
  "typeshare",
 ]
@@ -1237,6 +1226,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "sgf"
+version = "0.1.0"
+dependencies = [
+ "chrono",
+ "nom",
+ "serde",
+ "thiserror",
+ "typeshare",
+]
+
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.1"

sgf/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "go-sgf"
+name = "sgf"
 version = "0.1.0"
 edition = "2021"