houskeeping: linter run

Cargo.lock

@@ -409,15 +409,6 @@ dependencies = [
  "litrs",
 ]
 
-[[package]]
-name = "dsn"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a68ec86c8ab056c40c4d3f6a543ad0ad6a251d7d01dac251feed242aa44e754a"
-dependencies = [
- "percent-encoding",
-]
-
 [[package]]
 name = "dyn-clone"
 version = "1.0.20"
@@ -1103,7 +1094,6 @@ dependencies = [
  "cliclack",
  "colored",
  "comfy-table",
- "dsn",
  "futures",
  "indicatif",
  "miette",

Cargo.toml

@@ -12,7 +12,6 @@ clap = { version = "4.5.53", features = ["derive"] }
 cliclack = "0.3.7"
 colored = "3.0.0"
 comfy-table = "7.2.1"
-dsn = "1.2.1"
 futures = "0.3.31"
 indicatif = { version = "0.18.3", features = ["improved_unicode"] }
 miette = { version = "7.6.0", features = ["fancy"] }

src/controller.rs

@@ -1,4 +1,3 @@
-use dsn::DSN;
 use miette::miette;
 
 use colored::Colorize;
@@ -92,15 +91,10 @@ impl Controller {
 
         match format {
             ConnectionFormat::DSN => {
-                let dsn = DSN::builder()
+                println!(
-                    .driver("postgres")
+                    "postgres://{}:{}@127.0.0.1:{}/{}",
-                    .username(USERNAME)
+                    USERNAME, project.config.password, project.config.port, DATABASE
-                    .password(project.config.password.clone())
+                );
-                    .host("127.0.0.1")
-                    .port(project.config.port)
-                    .database(DATABASE)
-                    .build();
-                println!("{}", dsn.to_string());
             }
             ConnectionFormat::Human => {
                 format_conn_human(project);
@@ -128,13 +122,12 @@ impl Controller {
         let config = PGDConfig {
             version: *latest_version,
             password: utils::generate_password(),
-            port: utils::find_available_port()?,
+            port: utils::find_available_port(&self.ctx.state)?,
         };
         let project = Project::new(config)?;
 
         println!(
-            "\n{} {}\n",
+            "\nCreated pgd.toml in {}\n",
-            "Created pgd.toml in",
             project.path.display().to_string().bright_white().bold()
         );
 

src/controller/docker.rs

@@ -1,5 +1,5 @@
 use miette::{Diagnostic, miette};
-use std::{io::Write, str::FromStr};
+use std::str::FromStr;
 use thiserror::Error;
 
 use bollard::{
@@ -283,11 +283,11 @@ impl DockerController {
             ..Default::default()
         });
 
-        let logs = self
+        
+
+        self
             .daemon
             .logs(container_id, options)
-            .map(|k| k.into_diagnostic().wrap_err("Failed streaming logs"));
+            .map(|k| k.into_diagnostic().wrap_err("Failed streaming logs"))
-
-        logs
     }
 }

src/controller/docker/download.rs

@@ -8,7 +8,7 @@ use indicatif::{MultiProgress, ProgressBar, ProgressState, ProgressStyle};
 fn new_download_pb(multi: &MultiProgress, layer_id: &str) -> ProgressBar {
     let pb = multi.add(ProgressBar::new(0));
     pb.set_style(
-ProgressStyle::with_template(&"{spinner:.green} [{elapsed_precise}] {msg} [{wide_bar:.cyan/blue}] {bytes}/{total_bytes} ({eta})".to_string())
+ProgressStyle::with_template("{spinner:.green} [{elapsed_precise}] {msg} [{wide_bar:.cyan/blue}] {bytes}/{total_bytes} ({eta})")
 .unwrap()
 .with_key("eta", |state: &ProgressState, w: &mut dyn Write| {
     write!(w, "{:.1}s", state.eta().as_secs_f64()).unwrap()

src/controller/reconciler.rs

@@ -146,7 +146,7 @@ impl<'a> Reconciler<'a> {
                     .is_container_running_by_id(container_id)
                     .await?
                 {
-                    return Ok(());
+                    Ok(())
                 } else {
                     miette::bail!("Container stopped unexpectedly after start");
                 }

src/controller/utils.rs

@@ -1,12 +1,18 @@
 use miette::Result;
 use rand::{Rng, distr::Alphanumeric};
+
+use crate::state::StateManager;
 const DEFAULT_POSTGRES_PORT: u16 = 5432;
 const PORT_SEARCH_RANGE: u16 = 100;
 
-pub fn find_available_port() -> Result<u16> {
+pub fn find_available_port(state: &StateManager) -> Result<u16> {
     use std::net::TcpListener;
 
-    for port in DEFAULT_POSTGRES_PORT..(DEFAULT_POSTGRES_PORT + PORT_SEARCH_RANGE) {
+    let starting_port = state
+        .get_highest_used_port()
+        .unwrap_or(DEFAULT_POSTGRES_PORT);
+
+    for port in starting_port..(starting_port + PORT_SEARCH_RANGE) {
         if TcpListener::bind(("127.0.0.1", port)).is_ok() {
             return Ok(port);
         }

src/state.rs

@@ -88,8 +88,8 @@ impl StateManager {
         self.0.borrow_mut().instances.insert(project_name, state);
     }
 
-    pub fn remove(&self, project_name: &str) -> Option<InstanceState> {
+    pub fn get_highest_used_port(&self) -> Option<u16> {
-        self.0.borrow_mut().instances.remove(project_name)
+        self.0.borrow().instances.values().map(|i| i.port).max()
     }
 }