api: fix sl1 processing to account for relative paths

src/api.rs

@@ -34,23 +34,13 @@ use crate::{
 
 #[handler]
 async fn start_print(
-    URLPath((location, file_name)): URLPath<(LocationCategory, String)>,
+    URLPath((location, file_path)): URLPath<(LocationCategory, String)>,
     Data(operation_sender): Data<&mpsc::Sender<Operation>>,
     Data(configuration): Data<&ApiConfig>,
 ) -> Result<()> {
-    let pathbuf = get_file_path(configuration, &file_name, &location)?;
-
-    let path = pathbuf
-        .into_os_string()
-        .into_string()
-        .map_err(|_| NotFoundError)?;
+    let full_file_path = get_file_path(configuration, &file_path, &location)?;
 
-    let file_data = FileData {
-        name: file_name,
-        path,
-        last_modified: None,
-        location_category: location,
-    };
+    let file_data = _get_filedata(full_file_path, &location, configuration)?;
 
     operation_sender
         .send(Operation::StartPrint { file_data })
@@ -282,10 +272,7 @@ fn get_file_path(
 }
 
 // Since USB paths are specified as a glob, find all and filter to file_name
-fn get_usb_file_path(
-    configuration: &ApiConfig,
-    file_name: &str,
-) -> Result<PathBuf, NotFoundError> {
+fn get_usb_file_path(configuration: &ApiConfig, file_name: &str) -> Result<PathBuf, NotFoundError> {
     let paths = glob(&configuration.usb_glob).map_err(|_| NotFoundError)?;
 
     let path_buf = paths
@@ -327,6 +314,7 @@ fn _get_filedata(
         .and_then(|modified| modified.duration_since(UNIX_EPOCH).ok())
         .map(|dur| dur.as_millis());
 
+    // TODO handle USB _get_filedata
     Ok(FileData {
         path: target_file
             .strip_prefix(configuration.upload_path.as_str())
@@ -347,6 +335,7 @@ fn _get_filedata(
             })?,
         last_modified: modified_time,
         location_category: location.clone(),
+        parent_path: configuration.upload_path.clone(),
     })
 }
 
@@ -394,7 +383,7 @@ async fn get_file_metadata(
 
 #[handler]
 async fn delete_file(
-    URLPath((_location, _file_name)): URLPath<(LocationCategory, String)>,
+    URLPath((_location, _file_path)): URLPath<(LocationCategory, String)>,
     Data(_configuration): Data<&ApiConfig>,
 ) -> Result<Json<FileData>> {
     Err(NotImplemented(MethodNotAllowedError))

src/printfile.rs

@@ -13,6 +13,7 @@ pub struct FileData {
     pub name: String,
     pub last_modified: Option<u128>,
     pub location_category: LocationCategory,
+    pub parent_path: String,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]

src/sl1.rs

@@ -1,4 +1,4 @@
-use std::{fs::File, io::Read};
+use std::{fs::File, io::Read, path::Path};
 
 use async_trait::async_trait;
 use config::{Config, ConfigError, File as ConfigFile, FileFormat};
@@ -70,7 +70,10 @@ impl PrintFile for Sl1 {
     /// Instantiate the Sl1 from the given file
     fn from_file(file_data: FileData) -> Sl1 {
         log::info!("Loading PrintFile from SL1 {:?}", file_data);
-        let file = File::open(file_data.path.clone()).unwrap();
+
+        let full_path = Path::new(file_data.parent_path.as_str()).join(file_data.path.as_str());
+
+        let file = File::open(full_path).unwrap();
 
         let mut archive = ZipArchive::new(file).unwrap();