Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bbb19754bd | ||
|
|
c2e208a20b | ||
|
|
b157703162 | ||
|
|
ea07d11034 |
No files matched your search
Generated
+1
-1
@@ -1367,7 +1367,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "karnaugh"
|
name = "karnaugh"
|
||||||
version = "0.1.0"
|
version = "0.1.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"axum",
|
"axum",
|
||||||
"clap",
|
"clap",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "karnaugh"
|
name = "karnaugh"
|
||||||
version = "0.1.0"
|
version = "0.1.3"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -21,9 +21,9 @@
|
|||||||
rec {
|
rec {
|
||||||
packages.karnaugh = pkgs.rustPlatform.buildRustPackage (final: {
|
packages.karnaugh = pkgs.rustPlatform.buildRustPackage (final: {
|
||||||
pname = "karnaugh";
|
pname = "karnaugh";
|
||||||
version = "0.1.0";
|
version = "0.1.3";
|
||||||
src = self;
|
src = self;
|
||||||
cargoHash = "sha256-4jmvuQiQz5TCkY//L2qyx0AiDTxHu8EocFfysgaTaHU=";
|
cargoHash = "sha256-HwwvbYf9hKBANbIoxBQFOgya3K7SwWZCPZKvLGB057U=";
|
||||||
});
|
});
|
||||||
packages.container = pkgs.dockerTools.buildImage {
|
packages.container = pkgs.dockerTools.buildImage {
|
||||||
name = "karnaugh";
|
name = "karnaugh";
|
||||||
@@ -31,16 +31,16 @@
|
|||||||
|
|
||||||
copyToRoot = pkgs.buildEnv {
|
copyToRoot = pkgs.buildEnv {
|
||||||
name = "karnaugh-root";
|
name = "karnaugh-root";
|
||||||
paths = [packages.karnaugh];
|
paths = [ packages.karnaugh ];
|
||||||
pathsToLink = ["/bin"];
|
pathsToLink = [ "/bin" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
Cmd = ["/bin/karnaugh"];
|
Entrypoint = [ "/bin/karnaugh" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
packages.default = packages.karnaugh;
|
packages.default = packages.karnaugh;
|
||||||
|
|
||||||
devShells.default = pkgs.mkShell {
|
devShells.default = pkgs.mkShell {
|
||||||
buildInputs = with pkgs; [
|
buildInputs = with pkgs; [
|
||||||
cargo
|
cargo
|
||||||
|
|||||||
+6
-2
@@ -108,8 +108,12 @@ async fn main() {
|
|||||||
|
|
||||||
let socket = SocketAddrV4::new(Ipv4Addr::new(0, 0, 0, 0), state.config.port);
|
let socket = SocketAddrV4::new(Ipv4Addr::new(0, 0, 0, 0), state.config.port);
|
||||||
info!("Serving Karnaugh on socket {}", socket);
|
info!("Serving Karnaugh on socket {}", socket);
|
||||||
let listener = tokio::net::TcpListener::bind(socket).await.unwrap();
|
let listener = tokio::net::TcpListener::bind(socket)
|
||||||
axum::serve(listener, app).await.unwrap();
|
.await
|
||||||
|
.expect(&format!("Failed to bind to socket {}", socket));
|
||||||
|
axum::serve(listener, app)
|
||||||
|
.await
|
||||||
|
.expect("Failed to serve site");
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn root_handler(State(state): State<AppState>) -> impl IntoResponse {
|
async fn root_handler(State(state): State<AppState>) -> impl IntoResponse {
|
||||||
|
|||||||
+9
-3
@@ -138,7 +138,10 @@ impl<'a> DocumentWorld<'a> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn get_package(&self, spec: &PackageSpec) -> PackageResult<PathBuf> {
|
fn get_package(&self, spec: &PackageSpec) -> PackageResult<PathBuf> {
|
||||||
let path = get_package_path(&VirtualPath::new("").unwrap(), spec);
|
let path = get_package_path(
|
||||||
|
&VirtualPath::new("").expect("Failed to create empty virtual path"),
|
||||||
|
spec,
|
||||||
|
);
|
||||||
let path = path.realize(&self.context.config.packages_root);
|
let path = path.realize(&self.context.config.packages_root);
|
||||||
|
|
||||||
if path.exists() {
|
if path.exists() {
|
||||||
@@ -177,6 +180,9 @@ impl<'a> DocumentWorld<'a> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn get_package_path(file_path: &VirtualPath, spec: &PackageSpec) -> VirtualPath {
|
fn get_package_path(file_path: &VirtualPath, spec: &PackageSpec) -> VirtualPath {
|
||||||
let package_path = VirtualPath::new(format!("{}/{}", spec.name, spec.version)).unwrap();
|
let package_path = VirtualPath::new(format!("{}/{}", spec.name, spec.version))
|
||||||
package_path.join(file_path.get_without_slash()).unwrap()
|
.expect("Failed to create virtual path representing package path.");
|
||||||
|
package_path
|
||||||
|
.join(file_path.get_without_slash())
|
||||||
|
.expect("Failed to join file path into package path.")
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user