refactor: rename crates

Author: ymgyt

Cargo.lock

@@ -1,5 +1,5 @@
 [package]
-name = "syndapi"
+name = "synd_api"
 version = "0.1.0"
 description = "syndicationd backend api"
 authors.workspace = true
@@ -27,7 +27,7 @@ reqwest = { workspace = true }
 serde = { workspace = true }
 serde_json = "1.0.111"
 supports-color = { version = "2.1.0" }
-synd = { path = "../synd" }
+synd_feed = { path = "../synd_feed", version = "0.1.0" }
 thiserror = "1.0.56"
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
 tracing = { workspace = true }

crates/syndapi/Cargo.toml crates/synd_api/Cargo.toml

@@ -1,6 +1,6 @@
 use std::{sync::Arc, time::Duration};
 
-use synd::feed::{
+use synd_feed::feed::{
     cache::{CacheConfig, CacheLayer},
     parser::FeedService,
 };

crates/syndapi/src/args.rs crates/synd_api/src/args.rs

@@ -1,7 +1,7 @@
 use std::convert::Infallible;
 
 use async_graphql::connection::CursorType;
-use synd::types;
+use synd_feed::types;
 
 pub enum Id {
     V1(IdV1),

crates/syndapi/src/client/github/client.rs crates/synd_api/src/client/github/client.rs

@@ -5,7 +5,7 @@ use async_graphql::{
     Enum, Object, SimpleObject, ID,
 };
 use feed_rs::model as feedrs;
-use synd::types;
+use synd_feed::types;
 
 use crate::gql::scalar;
 
@@ -76,7 +76,7 @@ impl<'a> Entry<'a> {
 }
 
 #[derive(Enum, Clone, Copy, PartialEq, Eq)]
-#[graphql(remote = "synd::types::FeedType")]
+#[graphql(remote = "synd_feed::types::FeedType")]
 pub enum FeedType {
     Atom,
     RSS1,

crates/syndapi/src/client/github/mod.rs crates/synd_api/src/client/github/mod.rs

@@ -2,7 +2,7 @@ use async_graphql::{InputValueError, Scalar, ScalarType, Value};
 use chrono::Utc;
 
 /// RFC3339 Time
-pub struct Rfc3339Time(synd::types::Time);
+pub struct Rfc3339Time(synd_feed::types::Time);
 
 #[Scalar]
 impl ScalarType for Rfc3339Time {
@@ -22,8 +22,8 @@ impl ScalarType for Rfc3339Time {
     }
 }
 
-impl From<synd::types::Time> for Rfc3339Time {
-    fn from(value: synd::types::Time) -> Self {
+impl From<synd_feed::types::Time> for Rfc3339Time {
+    fn from(value: synd_feed::types::Time) -> Self {
         Self(value)
     }
 }

crates/syndapi/src/client/github/query.gql crates/synd_api/src/client/github/query.gql

@@ -1,9 +1,9 @@
 use tracing::{error, info};
 
-use syndapi::{args, dependency::Dependency, serve::listen_and_serve};
+use synd_api::{args, dependency::Dependency, serve::listen_and_serve};
 
 fn init_tracing() {
-    use syndapi::serve::layer::audit;
+    use synd_api::serve::layer::audit;
     use tracing_subscriber::{
         filter::EnvFilter, fmt, layer::SubscriberExt, util::SubscriberInitExt as _, Layer as _,
         Registry,

crates/syndapi/src/client/github/query.rs crates/synd_api/src/client/github/query.rs

@@ -1,7 +1,7 @@
 use std::{cmp::Ordering, collections::HashMap, sync::Arc};
 
 use futures_util::{stream::FuturesUnordered, StreamExt};
-use synd::{
+use synd_feed::{
     feed::{cache::FetchCachedFeed, parser::ParserError},
     types::{self, EntryId},
 };

crates/syndapi/src/client/github/schema.json crates/synd_api/src/client/github/schema.json

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use synd::{feed::cache::FetchCachedFeed, types};
+use synd_feed::{feed::cache::FetchCachedFeed, types};
 
 use crate::{
     persistence::Datastore,

crates/syndapi/src/client/mod.rs crates/synd_api/src/client/mod.rs

@@ -17,7 +17,7 @@ use tracing::error;
 pub mod authorize;
 use std::{future::Future, sync::Arc};
 
-use synd::feed::cache::FetchCachedFeed;
+use synd_feed::feed::cache::FetchCachedFeed;
 
 use crate::{
     audit,

crates/syndapi/src/config.rs crates/synd_api/src/config.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use synd::{feed::cache::FetchCachedFeed, types::Feed};
+use synd_feed::{feed::cache::FetchCachedFeed, types::Feed};
 
 use crate::{
     persistence::{self, Datastore},

crates/syndapi/src/dependency.rs crates/synd_api/src/dependency.rs

@@ -1,5 +1,5 @@
 [package]
-name = "synd"
+name = "synd_feed"
 version = "0.1.0"
 description = "Library to handle syndication spec"
 authors.workspace = true

crates/syndapi/src/gql/mod.rs crates/synd_api/src/gql/mod.rs

@@ -1,5 +1,5 @@
 [package]
-name = "syndterm"
+name = "synd_term"
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true
@@ -30,7 +30,7 @@ ratatui = { git = "https://github.com/ratatui-org/ratatui.git", branch = "main"
 reqwest = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = "1.0.111"
-synd = { path = "../synd" }
+synd_feed = { path = "../synd_feed", version = "0.1.0" }
 tokio = { workspace = true, features = [
   "macros",
   "rt-multi-thread",

crates/syndapi/src/gql/mutation/mod.rs crates/synd_api/src/gql/mutation/mod.rs

@@ -10,7 +10,7 @@ mod clear;
 #[derive(Parser, Debug)]
 #[command(version, propagate_version = true, about = "xxx")]
 pub struct Args {
-    /// syndapi endpoint
+    /// synd_api endpoint
     #[arg(long, default_value = config::api::ENDPOINT)]
     pub endpoint: Url,
     /// Log file path

crates/syndapi/src/gql/mutation/subscribe_feed.rs crates/synd_api/src/gql/mutation/subscribe_feed.rs

@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use crossterm::event::EventStream;
-use syndterm::{
+use synd_term::{
     application::Application,
     auth,
     cli::{self, Args},

crates/syndapi/src/gql/mutation/unsubscribe_feed.rs crates/synd_api/src/gql/mutation/unsubscribe_feed.rs

@@ -1,4 +1,4 @@
-pub type Time = synd::types::Time;
+pub type Time = synd_feed::types::Time;
 
 pub trait TimeExt {
     fn local_ymd(&self) -> String;

crates/syndapi/src/gql/object/id.rs crates/synd_api/src/gql/object/id.rs

@@ -10,7 +10,7 @@ mod test {
         style::{Modifier, Style},
     };
     use serial_test::file_serial;
-    use syndterm::{
+    use synd_term::{
         application::{Application, Config},
         client::Client,
         ui::theme::Theme,

crates/syndapi/src/gql/object/mod.rs crates/synd_api/src/gql/object/mod.rs

@@ -1,5 +1,5 @@
 use ratatui::backend::TestBackend;
-use syndterm::terminal::Terminal;
+use synd_term::terminal::Terminal;
 
 pub fn new_test_terminal() -> Terminal {
     let backend = TestBackend::new(80, 20);

crates/syndapi/src/gql/query.rs crates/synd_api/src/gql/query.rs

@@ -44,26 +44,26 @@
 
         cargoArtifacts = craneLib.buildDepsOnly commonArgs;
 
-        syndtermCrate = craneLib.crateNameFromCargoToml {
-          cargoToml = ./crates/syndterm/Cargo.toml;
+        syndTermCrate = craneLib.crateNameFromCargoToml {
+          cargoToml = ./crates/synd_term/Cargo.toml;
         };
-        syndterm = craneLib.buildPackage (commonArgs // {
+        syndTerm = craneLib.buildPackage (commonArgs // {
           inherit cargoArtifacts;
-          inherit (syndtermCrate) pname version;
-          cargoExtraArgs = "--package ${syndtermCrate.pname}";
+          inherit (syndTermCrate) pname version;
+          cargoExtraArgs = "--package ${syndTermCrate.pname}";
         });
 
-        syndapiCrate = craneLib.crateNameFromCargoToml {
-          cargoToml = ./crates/syndapi/Cargo.toml;
+        syndApiCrate = craneLib.crateNameFromCargoToml {
+          cargoToml = ./crates/synd_api/Cargo.toml;
         };
-        syndapi = craneLib.buildPackage (commonArgs // {
+        syndApi = craneLib.buildPackage (commonArgs // {
           inherit cargoArtifacts;
-          inherit (syndapiCrate) pname version;
-          cargoExtraArgs = "--package ${syndapiCrate.pname}";
+          inherit (syndApiCrate) pname version;
+          cargoExtraArgs = "--package ${syndApiCrate.pname}";
         });
 
         checks = {
-          inherit syndterm syndapi;
+          inherit syndTerm syndApi;
 
           clippy = craneLib.cargoClippy (commonArgs // {
             inherit cargoArtifacts;
@@ -93,11 +93,11 @@
       in {
         inherit checks;
 
-        packages.default = self.packages."${system}".syndterm;
-        packages.syndterm = syndterm;
-        packages.syndapi = syndapi;
+        packages.default = self.packages."${system}".synd;
+        packages.synd = syndTerm;
+        packages.synd_api = syndApi;
 
-        apps.default = flake-utils.lib.mkApp { drv = syndterm; };
+        apps.default = flake-utils.lib.mkApp { drv = syndTerm; };
 
         devShells.default = craneLib.devShell {
           packages = dev_packages;

crates/syndapi/src/gql/scalar.rs crates/synd_api/src/gql/scalar.rs

@@ -13,49 +13,52 @@ check:
 # Format files
 fmt: fmt-toml
 
+lint:
+  cargo clippy
+
 # Format toml files
 fmt-toml:
   taplo fmt **.toml
 
 # Run integration test
 integration:
-  RUST_LOG="syndterm,integration=debug" cargo nextest run --package syndterm --features integration --test integration --no-capture 
+  RUST_LOG="synd_term,integration=debug" cargo nextest run --package syndterm --features integration --test integration --no-capture 
 
 update-gql-schema:
   @graphql-client introspect-schema http://localhost:5959/graphql \
-    --header 'authorization: github {{github_pat}}' out> syndterm/gql/schema.json
+    --header 'authorization: github {{github_pat}}' out> crates/synd_term/gql/schema.json
 
 
 gen-gql:
   graphql-client generate \
-    --schema-path syndterm/gql/schema.json \
-    --output-directory syndterm/src/client \
+    --schema-path crates/syndterm/gql/schema.json \
+    --output-directory crates/syndterm/src/client \
     --response-derives "Debug" \
     --custom-scalars-module "crate::client::scalar" \
-    syndterm/gql/query.gql
+    crates/syndterm/gql/query.gql
 
   graphql-client generate \
-    --schema-path syndterm/gql/schema.json \
-    --output-directory syndterm/src/client \
+    --schema-path crates/syndterm/gql/schema.json \
+    --output-directory crates/syndterm/src/client \
     --response-derives "Debug" \
     --custom-scalars-module "crate::client::scalar" \
-    syndterm/gql/mutation.gql
+    crates/syndterm/gql/mutation.gql
 
   graphql-client generate \
-    --schema-path syndapi/src/client/github/schema.json \
-    --output-directory syndapi/src/client/github \
+    --schema-path crates/synd_api/src/client/github/schema.json \
+    --output-directory crates/synd_api/src/client/github \
     --response-derives "Debug" \
-    syndapi/src/client/github/query.gql
+    crates/synd_api/src/client/github/query.gql
 
 # Run kvsd
 kvsd:
   ~/.cargo/bin/kvsd server --disable-tls --config dev/kvsd_config.yaml --username {{kvsd_user}}
 
 # Run api
 api:
-  cd syndapi; RUST_LOG="info" cargo run --features "introspection" -- \
+  cd crates/synd_api; RUST_LOG="info" cargo run --features "introspection" -- \
     --kvsd-host 127.0.0.1 --kvsd-port 7379 --kvsd-username {{kvsd_user}} --kvsd-password secret
 
 # Run term
 term:
-  cd syndterm; cargo run -- --log /tmp/syndterm.log
+  cd crates/synd_term; cargo run -- --log /tmp/syndterm.log