diff options
84 files changed, 187 insertions, 40 deletions
@@ -27,3 +27,6 @@ whirl.db-wal # Nix result* + +# Legacy +/src/server_dev/ diff --git a/.license_template b/.license_template index 80ac9a1..cbe1816 100644 --- a/.license_template +++ b/.license_template @@ -1,2 +1,2 @@ -// Copyleft {\d+} Whirlsplash +// Copyleft {20\d{2}(-20\d{2})?} Whirlsplash // SPDX-License-Identifier: GPL-3.0-only diff --git a/default.nix b/default.nix index 5691a41..1b279f4 100644 --- a/default.nix +++ b/default.nix @@ -1,20 +1,20 @@ - { system ? builtins.currentSystem }: +{ system ? builtins.currentSystem }: - let - sources = import ./nix/sources.nix; - pkgs = import sources.nixpkgs { }; - whirl = import ./whirl.nix { inherit sources pkgs; }; +let + sources = import ./nix/sources.nix; + pkgs = import sources.nixpkgs { }; + whirl = import ./whirl.nix { inherit sources pkgs; }; - name = "Whirlsplash/whirl"; - tag = "latest"; + name = "Whirlsplash/whirl"; + tag = "latest"; in pkgs.dockerTools.buildLayeredImage { - inherit name tag; - contents = [ whirl ]; + inherit name tag; + contents = [ whirl ]; - config = { - Cmd = [ "/bin/whirl" ]; - Env = [ ]; - WorkingDir = "/"; - }; + config = { + Cmd = [ "/bin/whirl" ]; + Env = [ ]; + WorkingDir = "/"; + }; } diff --git a/nix/rust.nix b/nix/rust.nix index c6e8c2a..5066437 100644 --- a/nix/rust.nix +++ b/nix/rust.nix @@ -1,10 +1,10 @@ { sources ? import ./sources.nix }: let - pkgs = - import sources.nixpkgs { overlays = [ (import sources.nixpkgs-mozilla) ]; }; - channel = "nightly"; - date = "2021-02-20"; - targets = [ ]; - chan = pkgs.rustChannelOfTargets channel date targets; + pkgs = + import sources.nixpkgs { overlays = [ (import sources.nixpkgs-mozilla) ]; }; + channel = "nightly"; + date = "2021-02-20"; + targets = [ ]; + chan = pkgs.rustChannelOfTargets channel date targets; in chan diff --git a/rustfmt.toml b/rustfmt.toml index 8e9ff7a..de1e0ce 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -9,7 +9,7 @@ format_code_in_doc_comments = true format_macro_matchers = true format_strings = true imports_layout = "HorizontalVertical" -#license_template_path = ".license_template" +license_template_path = ".license_template" match_arm_blocks = false imports_granularity = "Crate" newline_style = "Unix" @@ -1,8 +1,8 @@ let - sources = import ./nix/sources.nix; - rust = import ./nix/rust.nix { inherit sources; }; - pkgs = import sources.nixpkgs { }; + sources = import ./nix/sources.nix; + rust = import ./nix/rust.nix { inherit sources; }; + pkgs = import sources.nixpkgs { }; in pkgs.mkShell { - buildInputs = with pkgs; [ rust ]; + buildInputs = with pkgs; [ rust ]; } @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + use structopt::clap::{App, AppSettings, Arg, SubCommand}; pub fn cli<'b, 'a>() -> App<'a, 'b> { diff --git a/src/config.rs b/src/config.rs index 7951ff5..d1a49ce 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + use serde_derive::{Deserialize, Serialize}; #[derive(Debug, Serialize, Deserialize)] diff --git a/src/db/mod.rs b/src/db/mod.rs index 5ec9ffb..c180764 100644 --- a/src/db/mod.rs +++ b/src/db/mod.rs @@ -1 +1,4 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + mod tables; diff --git a/src/db/tables.rs b/src/db/tables.rs index 3d1e00c..34b16e9 100644 --- a/src/db/tables.rs +++ b/src/db/tables.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + //! Much of the documentation that you will see within this module is quoted //! from http://dev.worlds.net/private/GammaDocs/WorldServer.html#RoomServer. @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + #![feature(type_ascription, hash_set_entry, type_name_of_val)] #![warn(rust_2018_idioms)] diff --git a/src/main.rs b/src/main.rs index 22d72a6..d7b572b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + #[macro_use] extern crate log; diff --git a/src/re_server/cmd/commands/action.rs b/src/re_server/cmd/commands/action.rs index 03eb10e..99da54f 100644 --- a/src/re_server/cmd/commands/action.rs +++ b/src/re_server/cmd/commands/action.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + use bytes::{BufMut, BytesMut}; pub fn create_action() -> Vec<u8> { diff --git a/src/re_server/cmd/commands/buddy_list/create.rs b/src/re_server/cmd/commands/buddy_list/create.rs index dc9bddd..e201cbb 100644 --- a/src/re_server/cmd/commands/buddy_list/create.rs +++ b/src/re_server/cmd/commands/buddy_list/create.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + use bytes::{BufMut, BytesMut}; use crate::re_server::cmd::{commands::buddy_list::structure::Buddy, constants::BUDDYLISTNOTIFY}; diff --git a/src/re_server/cmd/commands/buddy_list/mod.rs b/src/re_server/cmd/commands/buddy_list/mod.rs index 02f63a3..14440dc 100644 --- a/src/re_server/cmd/commands/buddy_list/mod.rs +++ b/src/re_server/cmd/commands/buddy_list/mod.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + pub mod create; pub mod parse; pub mod structure; diff --git a/src/re_server/cmd/commands/buddy_list/parse.rs b/src/re_server/cmd/commands/buddy_list/parse.rs index 4e96f5f..6705aaa 100644 --- a/src/re_server/cmd/commands/buddy_list/parse.rs +++ b/src/re_server/cmd/commands/buddy_list/parse.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + use std::str::from_utf8; use crate::re_server::cmd::commands::buddy_list::structure::Buddy; diff --git a/src/re_server/cmd/commands/buddy_list/structure.rs b/src/re_server/cmd/commands/buddy_list/structure.rs index 732a847..5da24d5 100644 --- a/src/re_server/cmd/commands/buddy_list/structure.rs +++ b/src/re_server/cmd/commands/buddy_list/structure.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + pub struct Buddy { pub buddy: String, pub add: u8, diff --git a/src/re_server/cmd/commands/mod.rs b/src/re_server/cmd/commands/mod.rs index 3a49b47..b484e2f 100644 --- a/src/re_server/cmd/commands/mod.rs +++ b/src/re_server/cmd/commands/mod.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + pub mod action; pub mod buddy_list; pub mod property; diff --git a/src/re_server/cmd/commands/property/create.rs b/src/re_server/cmd/commands/property/create.rs index e6d0714..9ea1dec 100644 --- a/src/re_server/cmd/commands/property/create.rs +++ b/src/re_server/cmd/commands/property/create.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + use crate::{ config::get_config, re_server::{ diff --git a/src/re_server/cmd/commands/property/mod.rs b/src/re_server/cmd/commands/property/mod.rs index d6ebc5b..0bea58f 100644 --- a/src/re_server/cmd/commands/property/mod.rs +++ b/src/re_server/cmd/commands/property/mod.rs @@ -1,2 +1,5 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + pub mod create; pub mod parse; diff --git a/src/re_server/cmd/commands/property/parse.rs b/src/re_server/cmd/commands/property/parse.rs index 4f7c108..50bde06 100644 --- a/src/re_server/cmd/commands/property/parse.rs +++ b/src/re_server/cmd/commands/property/parse.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + use crate::re_server::net::structure::NetworkProperty; pub fn find_property_in_property_list( diff --git a/src/re_server/cmd/commands/register_object_id/create.rs b/src/re_server/cmd/commands/register_object_id/create.rs index e69de29..858d572 100644 --- a/src/re_server/cmd/commands/register_object_id/create.rs +++ b/src/re_server/cmd/commands/register_object_id/create.rs @@ -0,0 +1,2 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only diff --git a/src/re_server/cmd/commands/register_object_id/mod.rs b/src/re_server/cmd/commands/register_object_id/mod.rs index c5fb369..08317e1 100644 --- a/src/re_server/cmd/commands/register_object_id/mod.rs +++ b/src/re_server/cmd/commands/register_object_id/mod.rs @@ -1 +1,4 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + pub mod create; diff --git a/src/re_server/cmd/commands/room/create.rs b/src/re_server/cmd/commands/room/create.rs index 7a49ded..8cfb960 100644 --- a/src/re_server/cmd/commands/room/create.rs +++ b/src/re_server/cmd/commands/room/create.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + use bytes::{BufMut, BytesMut}; use crate::{config::get_config, re_server::cmd::constants::REDIRID}; diff --git a/src/re_server/cmd/commands/room/mod.rs b/src/re_server/cmd/commands/room/mod.rs index d6ebc5b..0bea58f 100644 --- a/src/re_server/cmd/commands/room/mod.rs +++ b/src/re_server/cmd/commands/room/mod.rs @@ -1,2 +1,5 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + pub mod create; pub mod parse; diff --git a/src/re_server/cmd/commands/room/parse.rs b/src/re_server/cmd/commands/room/parse.rs index c6bb25c..70bd0a8 100644 --- a/src/re_server/cmd/commands/room/parse.rs +++ b/src/re_server/cmd/commands/room/parse.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + use std::str::from_utf8; pub fn parse_room_id_request(data: Vec<u8>) -> String { diff --git a/src/re_server/cmd/commands/session/mod.rs b/src/re_server/cmd/commands/session/mod.rs index 8b13789..858d572 100644 --- a/src/re_server/cmd/commands/session/mod.rs +++ b/src/re_server/cmd/commands/session/mod.rs @@ -1 +1,2 @@ - +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only diff --git a/src/re_server/cmd/commands/session/parse.rs b/src/re_server/cmd/commands/session/parse.rs index 8b13789..858d572 100644 --- a/src/re_server/cmd/commands/session/parse.rs +++ b/src/re_server/cmd/commands/session/parse.rs @@ -1 +1,2 @@ - +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only diff --git a/src/re_server/cmd/commands/session/structure.rs b/src/re_server/cmd/commands/session/structure.rs index 8b13789..858d572 100644 --- a/src/re_server/cmd/commands/session/structure.rs +++ b/src/re_server/cmd/commands/session/structure.rs @@ -1 +1,2 @@ - +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only diff --git a/src/re_server/cmd/commands/subscribe/mod.rs b/src/re_server/cmd/commands/subscribe/mod.rs index 94bb423..d7fec55 100644 --- a/src/re_server/cmd/commands/subscribe/mod.rs +++ b/src/re_server/cmd/commands/subscribe/mod.rs @@ -1,2 +1,5 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + mod parse; mod structure; diff --git a/src/re_server/cmd/commands/subscribe/parse.rs b/src/re_server/cmd/commands/subscribe/parse.rs index 3caed08..657b4ba 100644 --- a/src/re_server/cmd/commands/subscribe/parse.rs +++ b/src/re_server/cmd/commands/subscribe/parse.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + use byteorder::{BigEndian, ReadBytesExt}; use bytes::{Buf, BytesMut}; diff --git a/src/re_server/cmd/commands/subscribe/structure.rs b/src/re_server/cmd/commands/subscribe/structure.rs index fb74e4f..6142aaa 100644 --- a/src/re_server/cmd/commands/subscribe/structure.rs +++ b/src/re_server/cmd/commands/subscribe/structure.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + pub struct SubscribeRoom { pub room_number: i16, pub distance: i16, diff --git a/src/re_server/cmd/commands/text/create.rs b/src/re_server/cmd/commands/text/create.rs index 02def7b..6e1a5a8 100644 --- a/src/re_server/cmd/commands/text/create.rs +++ b/src/re_server/cmd/commands/text/create.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + use bytes::{BufMut, BytesMut}; use crate::re_server::cmd::{commands::text::structure::Text, constants::TEXT}; diff --git a/src/re_server/cmd/commands/text/mod.rs b/src/re_server/cmd/commands/text/mod.rs index 02f63a3..14440dc 100644 --- a/src/re_server/cmd/commands/text/mod.rs +++ b/src/re_server/cmd/commands/text/mod.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + pub mod create; pub mod parse; pub mod structure; diff --git a/src/re_server/cmd/commands/text/parse.rs b/src/re_server/cmd/commands/text/parse.rs index 45999a0..078c19f 100644 --- a/src/re_server/cmd/commands/text/parse.rs +++ b/src/re_server/cmd/commands/text/parse.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + use std::str::from_utf8; use crate::re_server::cmd::commands::text::structure::Text; diff --git a/src/re_server/cmd/commands/text/structure.rs b/src/re_server/cmd/commands/text/structure.rs index 038fb12..eaeef38 100644 --- a/src/re_server/cmd/commands/text/structure.rs +++ b/src/re_server/cmd/commands/text/structure.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + pub struct Text { pub sender: String, pub content: String, diff --git a/src/re_server/cmd/commands/whisper.rs b/src/re_server/cmd/commands/whisper.rs index 8b13789..858d572 100644 --- a/src/re_server/cmd/commands/whisper.rs +++ b/src/re_server/cmd/commands/whisper.rs @@ -1 +1,2 @@ - +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only diff --git a/src/re_server/cmd/constants.rs b/src/re_server/cmd/constants.rs index ed07704..0db4143 100644 --- a/src/re_server/cmd/constants.rs +++ b/src/re_server/cmd/constants.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + pub const LONGLOC: i32 = 1; pub const STATE: i32 = 2; pub const PROP: i32 = 3; diff --git a/src/re_server/cmd/mod.rs b/src/re_server/cmd/mod.rs index 181a82d..c01f582 100644 --- a/src/re_server/cmd/mod.rs +++ b/src/re_server/cmd/mod.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + pub mod commands; pub mod constants; diff --git a/src/re_server/cmd/set_parser.rs b/src/re_server/cmd/set_parser.rs index be2a5dd..94ea51e 100644 --- a/src/re_server/cmd/set_parser.rs +++ b/src/re_server/cmd/set_parser.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + use crate::re_server::cmd::structure::Command; /// Iterate over a command set in the from of bytes and return a list of diff --git a/src/re_server/cmd/structure.rs b/src/re_server/cmd/structure.rs index 85c2288..ea6bc0c 100644 --- a/src/re_server/cmd/structure.rs +++ b/src/re_server/cmd/structure.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + pub struct Command { pub length: i32, pub obj_id: i32, diff --git a/src/re_server/distributor.rs b/src/re_server/distributor.rs index 5a8e3aa..d952fb7 100644 --- a/src/re_server/distributor.rs +++ b/src/re_server/distributor.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + //! The distributor functions as bare-minimal //! [AutoServer](http://dev.worlds.net/private/GammaDocs/WorldServer.html#AutoServer). //! diff --git a/src/re_server/hub.rs b/src/re_server/hub.rs index dffe183..a9c30bd 100644 --- a/src/re_server/hub.rs +++ b/src/re_server/hub.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + //! The hub functions as a //! [RoomServer](http://dev.worlds.net/private/GammaDocs/WorldServer.html#AutoServer). //! diff --git a/src/re_server/interaction/mod.rs b/src/re_server/interaction/mod.rs index 81d576b..4f0f38b 100644 --- a/src/re_server/interaction/mod.rs +++ b/src/re_server/interaction/mod.rs @@ -1,2 +1,5 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + pub mod peer; pub mod shared; diff --git a/src/re_server/interaction/peer.rs b/src/re_server/interaction/peer.rs index 0d5cf4e..898c5c8 100644 --- a/src/re_server/interaction/peer.rs +++ b/src/re_server/interaction/peer.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + use std::sync::Arc; use tokio::{ diff --git a/src/re_server/interaction/shared.rs b/src/re_server/interaction/shared.rs index ca7997a..9af6952 100644 --- a/src/re_server/interaction/shared.rs +++ b/src/re_server/interaction/shared.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + use std::collections::HashMap; use bytes::BytesMut; diff --git a/src/re_server/mod.rs b/src/re_server/mod.rs index df25a4c..8cd477d 100644 --- a/src/re_server/mod.rs +++ b/src/re_server/mod.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + pub mod cmd; mod interaction; pub mod net; diff --git a/src/re_server/net/constants.rs b/src/re_server/net/constants.rs index 64aa60a..04d94a9 100644 --- a/src/re_server/net/constants.rs +++ b/src/re_server/net/constants.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + pub const VAR_PROTOCOL_VERSION: i32 = 24; pub const STATECMD: i32 = 2; pub const MAXCMD: i32 = 255; diff --git a/src/re_server/net/converter.rs b/src/re_server/net/converter.rs index 36002ee..7087bc1 100644 --- a/src/re_server/net/converter.rs +++ b/src/re_server/net/converter.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + use bytes::{BufMut, BytesMut}; use crate::re_server::{ diff --git a/src/re_server/net/mod.rs b/src/re_server/net/mod.rs index 15b0bdb..c88ab7f 100644 --- a/src/re_server/net/mod.rs +++ b/src/re_server/net/mod.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + pub mod constants; pub mod converter; pub mod property_parser; diff --git a/src/re_server/net/property_parser.rs b/src/re_server/net/property_parser.rs index 1ee210f..ff03643 100644 --- a/src/re_server/net/property_parser.rs +++ b/src/re_server/net/property_parser.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + use std::str::from_utf8; use crate::re_server::net::structure::NetworkProperty; diff --git a/src/re_server/net/structure.rs b/src/re_server/net/structure.rs index b5d74a6..0128c0e 100644 --- a/src/re_server/net/structure.rs +++ b/src/re_server/net/structure.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + pub struct NetworkProperty { pub prop_id: i32, pub value: String, diff --git a/src/re_server/packet_parser.rs b/src/re_server/packet_parser.rs index c53610b..d8fd93d 100644 --- a/src/re_server/packet_parser.rs +++ b/src/re_server/packet_parser.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + use bytes::BytesMut; /// Read all commands from the given buffer. diff --git a/src/re_server/server.rs b/src/re_server/server.rs index f86b956..1e64476 100644 --- a/src/re_server/server.rs +++ b/src/re_server/server.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + use std::{error::Error, fmt, net::SocketAddr, sync::Arc}; use tokio::{ diff --git a/src/re_server/types.rs b/src/re_server/types.rs index 20dd176..8330875 100644 --- a/src/re_server/types.rs +++ b/src/re_server/types.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + use bytes::BytesMut; use tokio::sync::mpsc; diff --git a/src/server/auto/____server.rs b/src/server_dev/auto/____server.rs index 586bc16..586bc16 100644 --- a/src/server/auto/____server.rs +++ b/src/server_dev/auto/____server.rs diff --git a/src/server/auto/___server.rs b/src/server_dev/auto/___server.rs index 2f95952..2f95952 100644 --- a/src/server/auto/___server.rs +++ b/src/server_dev/auto/___server.rs diff --git a/src/server/auto/__server.rs b/src/server_dev/auto/__server.rs index b72b7e7..b72b7e7 100644 --- a/src/server/auto/__server.rs +++ b/src/server_dev/auto/__server.rs diff --git a/src/server/auto/_server.rs b/src/server_dev/auto/_server.rs index 8b7fa6c..8b7fa6c 100644 --- a/src/server/auto/_server.rs +++ b/src/server_dev/auto/_server.rs diff --git a/src/server/auto/cmd/mod.rs b/src/server_dev/auto/cmd/mod.rs index d2345c6..d2345c6 100644 --- a/src/server/auto/cmd/mod.rs +++ b/src/server_dev/auto/cmd/mod.rs diff --git a/src/server/auto/cmd/property.rs b/src/server_dev/auto/cmd/property.rs index e266757..e266757 100644 --- a/src/server/auto/cmd/property.rs +++ b/src/server_dev/auto/cmd/property.rs diff --git a/src/server/auto/cmd/room.rs b/src/server_dev/auto/cmd/room.rs index 79786ef..79786ef 100644 --- a/src/server/auto/cmd/room.rs +++ b/src/server_dev/auto/cmd/room.rs diff --git a/src/server/auto/cmd/session.rs b/src/server_dev/auto/cmd/session.rs index 19969dc..19969dc 100644 --- a/src/server/auto/cmd/session.rs +++ b/src/server_dev/auto/cmd/session.rs diff --git a/src/server/auto/mod.rs b/src/server_dev/auto/mod.rs index 24606ea..24606ea 100644 --- a/src/server/auto/mod.rs +++ b/src/server_dev/auto/mod.rs diff --git a/src/server/auto/server.rs b/src/server_dev/auto/server.rs index 164b271..164b271 100644 --- a/src/server/auto/server.rs +++ b/src/server_dev/auto/server.rs diff --git a/src/server/cmd/action.rs b/src/server_dev/cmd/action.rs index 1cf9086..1cf9086 100644 --- a/src/server/cmd/action.rs +++ b/src/server_dev/cmd/action.rs diff --git a/src/server/cmd/buddy_list.rs b/src/server_dev/cmd/buddy_list.rs index ba938f5..ba938f5 100644 --- a/src/server/cmd/buddy_list.rs +++ b/src/server_dev/cmd/buddy_list.rs diff --git a/src/server/cmd/mod.rs b/src/server_dev/cmd/mod.rs index 6db7826..6db7826 100644 --- a/src/server/cmd/mod.rs +++ b/src/server_dev/cmd/mod.rs diff --git a/src/server/cmd/property.rs b/src/server_dev/cmd/property.rs index 1530f58..1530f58 100644 --- a/src/server/cmd/property.rs +++ b/src/server_dev/cmd/property.rs diff --git a/src/server/cmd/session.rs b/src/server_dev/cmd/session.rs index 97efc8f..97efc8f 100644 --- a/src/server/cmd/session.rs +++ b/src/server_dev/cmd/session.rs diff --git a/src/server/cmd/text.rs b/src/server_dev/cmd/text.rs index cc306db..cc306db 100644 --- a/src/server/cmd/text.rs +++ b/src/server_dev/cmd/text.rs diff --git a/src/server/mod.rs b/src/server_dev/mod.rs index 6f2a839..6f2a839 100644 --- a/src/server/mod.rs +++ b/src/server_dev/mod.rs diff --git a/src/server/parser.rs b/src/server_dev/parser.rs index f856650..f856650 100644 --- a/src/server/parser.rs +++ b/src/server_dev/parser.rs diff --git a/src/server/room/__server.rs b/src/server_dev/room/__server.rs index 0923e1b..0923e1b 100644 --- a/src/server/room/__server.rs +++ b/src/server_dev/room/__server.rs diff --git a/src/server/room/_server.rs b/src/server_dev/room/_server.rs index e08c3d7..e08c3d7 100644 --- a/src/server/room/_server.rs +++ b/src/server_dev/room/_server.rs diff --git a/src/server/room/cmd/mod.rs b/src/server_dev/room/cmd/mod.rs index 1d123c0..1d123c0 100644 --- a/src/server/room/cmd/mod.rs +++ b/src/server_dev/room/cmd/mod.rs diff --git a/src/server/room/cmd/property.rs b/src/server_dev/room/cmd/property.rs index 3135d0a..3135d0a 100644 --- a/src/server/room/cmd/property.rs +++ b/src/server_dev/room/cmd/property.rs diff --git a/src/server/room/cmd/session.rs b/src/server_dev/room/cmd/session.rs index dee3931..dee3931 100644 --- a/src/server/room/cmd/session.rs +++ b/src/server_dev/room/cmd/session.rs diff --git a/src/server/room/mod.rs b/src/server_dev/room/mod.rs index 24606ea..24606ea 100644 --- a/src/server/room/mod.rs +++ b/src/server_dev/room/mod.rs diff --git a/src/server/room/server.rs b/src/server_dev/room/server.rs index 63a13f6..63a13f6 100644 --- a/src/server/room/server.rs +++ b/src/server_dev/room/server.rs diff --git a/src/server/structures.rs b/src/server_dev/structures.rs index 25fcf00..25fcf00 100644 --- a/src/server/structures.rs +++ b/src/server_dev/structures.rs diff --git a/src/utils/db.rs b/src/utils/db.rs index b95e159..b3b9667 100644 --- a/src/utils/db.rs +++ b/src/utils/db.rs @@ -1,3 +1,6 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + use std::error::Error; use sqlx::{sqlite::SqlitePoolOptions, SqlitePool}; diff --git a/src/utils/mod.rs b/src/utils/mod.rs index dec1023..8307077 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -1 +1,4 @@ +// Copyleft 2021-2021 Whirlsplash +// SPDX-License-Identifier: GPL-3.0-only + pub mod db; @@ -1,17 +1,17 @@ { sources ? import ./nix/sources.nix, pkgs ? import sources.nixpkgs { } }: let - rust = import ./nix/rust.nix { inherit sources; }; + rust = import ./nix/rust.nix { inherit sources; }; - naersk = pkgs.callPackage sources.naersk { - rustc = rust; - cargo = rust; - }; + naersk = pkgs.callPackage sources.naersk { + rustc = rust; + cargo = rust; + }; - src = builtins.filterSource - (path: type: type != "directory" || builtins.baseNameOf path != "target") - ./.; + src = builtins.filterSource + (path: type: type != "directory" || builtins.baseNameOf path != "target") + ./.; in naersk.buildPackage { - inherit src; - remapPathPrefix = true; + inherit src; + remapPathPrefix = true; } |