shockrah/clippable
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Path & PathBuf .join() methods are more headache than they're worth

Browse Source 
Here's two hard coded variables
This commit is contained in:
shockrah 2025-08-17 15:30:09 -07:00
parent 7d813391bd
commit eb99d97e7b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/src/main.rs
View File

@ -5,7 +5,7 @@ use rocket::fs::FileServer;
mod video; mod video;
mod db; mod db;
const FILES_ROOT: &'static str = "/opt/clippable"; const FILES_VIDEO: &'static str = "/opt/clippable/file/video";
const DB_FILE: &'static str = "/opt/clippable/db.json"; const DB_FILE: &'static str = "/opt/clippable/db.json";
const VIDEO_BASE_URI: &'static str = "/file/video"; const VIDEO_BASE_URI: &'static str = "/file/video";

7
service/src/video.rs
View File

@ -1,5 +1,5 @@
use crate::{FILES_ROOT, VIDEO_BASE_URI, db}; use crate::{FILES_VIDEO, VIDEO_BASE_URI, db};
use std::path::{Path, PathBuf}; use std::path::PathBuf;
use rocket::fs::NamedFile; use rocket::fs::NamedFile;
use rocket_dyn_templates::{Template, context}; use rocket_dyn_templates::{Template, context};
@ -25,8 +25,7 @@ pub fn index(video_id: &str) -> Template {
#[get("/<path>")] #[get("/<path>")]
pub async fn file(path: PathBuf) -> Option<NamedFile> { pub async fn file(path: PathBuf) -> Option<NamedFile> {
let mut disk = Path::new(FILES_ROOT).join(VIDEO_BASE_URI); let disk = PathBuf::from(FILES_VIDEO).join(path);
disk.push(path);
println!("disk path: {disk:?}"); println!("disk path: {disk:?}");
NamedFile::open(disk).await.ok() NamedFile::open(disk).await.ok()