Refactoring: improve structure (#74)

Author: queil

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "rooz"
-version = "0.95.0"
+version = "0.96.0"
 edition = "2021"
 
 [dependencies]

Cargo.toml

@@ -22,9 +22,9 @@ use tokio::time::sleep;
 
 use crate::{
     api::ContainerApi,
-    backend::ContainerBackend,
-    labels::{KeyValue, Labels},
     model::types::{AnyError, ContainerResult, RunSpec},
+    util::backend::ContainerBackend,
+    util::labels::{KeyValue, Labels},
 };
 
 pub fn inject(script: &str, name: &str) -> Vec<String> {
@@ -52,6 +52,14 @@ impl<'a> ContainerApi<'a> {
         Ok(self.client.list_containers(Some(list_options)).await?)
     }
 
+    pub async fn get_single(&self, labels: &Labels) -> Result<Option<ContainerSummary>, AnyError> {
+        match self.get_all(&labels).await?.as_slice() {
+            [] => Ok(None),
+            [container] => Ok(Some(container.clone())),
+            _ => panic!("Too many containers found"),
+        }
+    }
+
     pub async fn remove(&self, container_id: &str, force: bool) -> Result<(), AnyError> {
         let force_display = if force { " (force)" } else { "" };
 

src/api/container.rs

@@ -1,5 +1,6 @@
 use crate::{
-    api::container, api::ExecApi, backend::ContainerBackend, constants, model::types::AnyError,
+    api::container, api::ExecApi, constants, model::types::AnyError,
+    util::backend::ContainerBackend,
 };
 use bollard::{
     container::LogOutput,

src/api/exec.rs

@@ -1,6 +1,6 @@
 use bollard::Docker;
 
-use crate::backend::ContainerBackend;
+use crate::util::backend::ContainerBackend;
 
 pub mod container;
 pub mod exec;

src/api/mod.rs

@@ -4,13 +4,13 @@ use bollard::network::CreateNetworkOptions;
 
 use crate::{
     api::WorkspaceApi,
+    config::config::{RoozCfg, RoozSidecar},
     constants,
-    labels::{self, Labels},
     model::{
-        config::{RoozCfg, RoozSidecar},
         types::{AnyError, RunSpec},
         volume::RoozVolume,
     },
+    util::labels::{self, Labels},
 };
 
 impl<'a> WorkspaceApi<'a> {

src/api/sidecar.rs

@@ -1,10 +1,10 @@
 use crate::{
     api::VolumeApi,
-    labels::Labels,
     model::{
         types::{AnyError, VolumeResult},
         volume::{RoozVolume, RoozVolumeRole},
     },
+    util::labels::Labels,
 };
 use bollard::{errors::Error::DockerResponseServerError, volume::RemoveVolumeOptions};
 use bollard::{service::Mount, volume::CreateVolumeOptions};