From c51fced23af8f81b9743b72c7981aa0c82aee9c8 Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Wed, 26 Jul 2023 19:06:59 -0400 Subject: [PATCH] Rename go-sgf to sgf. Add make instructions --- Makefile | 9 +++++++ kifu/core/Cargo.lock | 24 +++++++++---------- kifu/core/Cargo.toml | 2 +- kifu/core/src/database.rs | 4 ++-- kifu/core/src/ui/elements/game_preview.rs | 2 +- kifu/core/src/ui/home.rs | 2 +- kifu/gtk/Cargo.lock | 24 +++++++++---------- {go-sgf => sgf}/Cargo.lock | 0 {go-sgf => sgf}/Cargo.toml | 2 +- {go-sgf => sgf}/Makefile | 0 {go-sgf => sgf}/src/date.rs | 0 {go-sgf => sgf}/src/go.rs | 0 {go-sgf => sgf}/src/lib.rs | 0 {go-sgf => sgf}/src/tree.rs | 0 .../test_data/2020 USGO DDK, Round 1.sgf | 0 .../test_data/2020 USGO DDK, Round 3.sgf | 0 .../33745402-213-Ormos-savanni.dgerinel.sgf | 0 {go-sgf => sgf}/test_data/9kyu-lecture.sgf | 0 {go-sgf => sgf}/test_data/ff4_a.sgf | 0 {go-sgf => sgf}/test_data/ff4_b.sgf | 0 {go-sgf => sgf}/test_data/ff4_ex.sgf | 0 {go-sgf => sgf}/test_data/linebreak_tests.sgf | 0 {go-sgf => sgf}/test_data/print1.sgf | 0 {go-sgf => sgf}/test_data/print2.sgf | 0 24 files changed, 39 insertions(+), 30 deletions(-) rename {go-sgf => sgf}/Cargo.lock (100%) rename {go-sgf => sgf}/Cargo.toml (95%) rename {go-sgf => sgf}/Makefile (100%) rename {go-sgf => sgf}/src/date.rs (100%) rename {go-sgf => sgf}/src/go.rs (100%) rename {go-sgf => sgf}/src/lib.rs (100%) rename {go-sgf => sgf}/src/tree.rs (100%) rename {go-sgf => sgf}/test_data/2020 USGO DDK, Round 1.sgf (100%) rename {go-sgf => sgf}/test_data/2020 USGO DDK, Round 3.sgf (100%) rename {go-sgf => sgf}/test_data/33745402-213-Ormos-savanni.dgerinel.sgf (100%) rename {go-sgf => sgf}/test_data/9kyu-lecture.sgf (100%) rename {go-sgf => sgf}/test_data/ff4_a.sgf (100%) rename {go-sgf => sgf}/test_data/ff4_b.sgf (100%) rename {go-sgf => sgf}/test_data/ff4_ex.sgf (100%) rename {go-sgf => sgf}/test_data/linebreak_tests.sgf (100%) rename {go-sgf => sgf}/test_data/print1.sgf (100%) rename {go-sgf => sgf}/test_data/print2.sgf (100%) diff --git a/Makefile b/Makefile index ef03c40..44f3aa7 100644 --- a/Makefile +++ b/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 diff --git a/kifu/core/Cargo.lock b/kifu/core/Cargo.lock index 7ad8625..e15421d 100644 --- a/kifu/core/Cargo.lock +++ b/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" diff --git a/kifu/core/Cargo.toml b/kifu/core/Cargo.toml index 5972a7a..737ec89 100644 --- a/kifu/core/Cargo.toml +++ b/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" ] } diff --git a/kifu/core/src/database.rs b/kifu/core/src/database.rs index 6797e29..9ace920 100644 --- a/kifu/core/src/database.rs +++ b/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() { diff --git a/kifu/core/src/ui/elements/game_preview.rs b/kifu/core/src/ui/elements/game_preview.rs index cd16694..6669d71 100644 --- a/kifu/core/src/ui/elements/game_preview.rs +++ b/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)] diff --git a/kifu/core/src/ui/home.rs b/kifu/core/src/ui/home.rs index 12cca5b..7c06ae2 100644 --- a/kifu/core/src/ui/home.rs +++ b/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 { diff --git a/kifu/gtk/Cargo.lock b/kifu/gtk/Cargo.lock index 7225c74..53e612d 100644 --- a/kifu/gtk/Cargo.lock +++ b/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" diff --git a/go-sgf/Cargo.lock b/sgf/Cargo.lock similarity index 100% rename from go-sgf/Cargo.lock rename to sgf/Cargo.lock diff --git a/go-sgf/Cargo.toml b/sgf/Cargo.toml similarity index 95% rename from go-sgf/Cargo.toml rename to sgf/Cargo.toml index cc24121..ab75ce2 100644 --- a/go-sgf/Cargo.toml +++ b/sgf/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "go-sgf" +name = "sgf" version = "0.1.0" edition = "2021" diff --git a/go-sgf/Makefile b/sgf/Makefile similarity index 100% rename from go-sgf/Makefile rename to sgf/Makefile diff --git a/go-sgf/src/date.rs b/sgf/src/date.rs similarity index 100% rename from go-sgf/src/date.rs rename to sgf/src/date.rs diff --git a/go-sgf/src/go.rs b/sgf/src/go.rs similarity index 100% rename from go-sgf/src/go.rs rename to sgf/src/go.rs diff --git a/go-sgf/src/lib.rs b/sgf/src/lib.rs similarity index 100% rename from go-sgf/src/lib.rs rename to sgf/src/lib.rs diff --git a/go-sgf/src/tree.rs b/sgf/src/tree.rs similarity index 100% rename from go-sgf/src/tree.rs rename to sgf/src/tree.rs diff --git a/go-sgf/test_data/2020 USGO DDK, Round 1.sgf b/sgf/test_data/2020 USGO DDK, Round 1.sgf similarity index 100% rename from go-sgf/test_data/2020 USGO DDK, Round 1.sgf rename to sgf/test_data/2020 USGO DDK, Round 1.sgf diff --git a/go-sgf/test_data/2020 USGO DDK, Round 3.sgf b/sgf/test_data/2020 USGO DDK, Round 3.sgf similarity index 100% rename from go-sgf/test_data/2020 USGO DDK, Round 3.sgf rename to sgf/test_data/2020 USGO DDK, Round 3.sgf diff --git a/go-sgf/test_data/33745402-213-Ormos-savanni.dgerinel.sgf b/sgf/test_data/33745402-213-Ormos-savanni.dgerinel.sgf similarity index 100% rename from go-sgf/test_data/33745402-213-Ormos-savanni.dgerinel.sgf rename to sgf/test_data/33745402-213-Ormos-savanni.dgerinel.sgf diff --git a/go-sgf/test_data/9kyu-lecture.sgf b/sgf/test_data/9kyu-lecture.sgf similarity index 100% rename from go-sgf/test_data/9kyu-lecture.sgf rename to sgf/test_data/9kyu-lecture.sgf diff --git a/go-sgf/test_data/ff4_a.sgf b/sgf/test_data/ff4_a.sgf similarity index 100% rename from go-sgf/test_data/ff4_a.sgf rename to sgf/test_data/ff4_a.sgf diff --git a/go-sgf/test_data/ff4_b.sgf b/sgf/test_data/ff4_b.sgf similarity index 100% rename from go-sgf/test_data/ff4_b.sgf rename to sgf/test_data/ff4_b.sgf diff --git a/go-sgf/test_data/ff4_ex.sgf b/sgf/test_data/ff4_ex.sgf similarity index 100% rename from go-sgf/test_data/ff4_ex.sgf rename to sgf/test_data/ff4_ex.sgf diff --git a/go-sgf/test_data/linebreak_tests.sgf b/sgf/test_data/linebreak_tests.sgf similarity index 100% rename from go-sgf/test_data/linebreak_tests.sgf rename to sgf/test_data/linebreak_tests.sgf diff --git a/go-sgf/test_data/print1.sgf b/sgf/test_data/print1.sgf similarity index 100% rename from go-sgf/test_data/print1.sgf rename to sgf/test_data/print1.sgf diff --git a/go-sgf/test_data/print2.sgf b/sgf/test_data/print2.sgf similarity index 100% rename from go-sgf/test_data/print2.sgf rename to sgf/test_data/print2.sgf