Update to Rust 2024 edition

Formatted code.

src/main.rs

@@ -4,13 +4,13 @@ extern crate rayon;
 
 use actix_web::web::Data;
 use actix_web_prom::PrometheusMetricsBuilder;
-use diesel_migrations::{embed_migrations, EmbeddedMigrations, MigrationHarness};
+use diesel_migrations::{EmbeddedMigrations, MigrationHarness, embed_migrations};
 use futures::stream::StreamExt;
 use lazy_static::lazy_static;
 use prometheus::{self, IntGauge};
 use std::error::Error;
-use std::sync::mpsc::channel;
 use std::sync::Mutex;
+use std::sync::mpsc::channel;
 use std::{collections::HashMap, io::prelude::*};
 use std::{env, fs::File};
 use std::{
@@ -22,9 +22,8 @@ use walkdir::{DirEntry, WalkDir};
 use actix_files::NamedFile;
 use actix_multipart as mp;
 use actix_web::{
-    delete, get, middleware, post, put,
+    App, HttpRequest, HttpResponse, HttpServer, Responder, delete, get, middleware, post, put,
     web::{self, BufMut, BytesMut},
-    App, HttpRequest, HttpResponse, HttpServer, Responder,
 };
 use anyhow::Context;
 use chrono::Utc;
@@ -36,19 +35,19 @@ use crate::auth::login;
 use crate::data::*;
 use crate::database::*;
 use crate::files::{
-    is_image_or_video, is_valid_full_path, move_file, RealFileSystem, RefreshThumbnailsMessage,
+    RealFileSystem, RefreshThumbnailsMessage, is_image_or_video, is_valid_full_path, move_file,
 };
 use crate::otel::{extract_context_from_request, global_tracer};
 use crate::service::ServiceBuilder;
 use crate::state::AppState;
 use crate::tags::*;
 use crate::video::actors::{
-    create_playlist, generate_video_thumbnail, ProcessMessage, ScanDirectoryMessage,
+    ProcessMessage, ScanDirectoryMessage, create_playlist, generate_video_thumbnail,
 };
 use crate::video::generate_video_gifs;
 use log::{debug, error, info, trace, warn};
 use opentelemetry::trace::{Span, Status, TraceContextExt, Tracer};
-use opentelemetry::{global, KeyValue};
+use opentelemetry::{KeyValue, global};
 
 mod auth;
 mod data;
@@ -332,12 +331,17 @@ async fn stream_video(
         span.set_status(Status::error(format!("playlist not valid {}", playlist)));
 
         HttpResponse::BadRequest().finish()
-    } else if let Ok(file) = NamedFile::open(playlist) {
-        span.set_status(Status::Ok);
-        file.into_response(&request)
     } else {
-        span.set_status(Status::error(format!("playlist not found {}", playlist)));
-        HttpResponse::NotFound().finish()
+        match NamedFile::open(playlist) {
+            Ok(file) => {
+                span.set_status(Status::Ok);
+                file.into_response(&request)
+            }
+            _ => {
+                span.set_status(Status::error(format!("playlist not found {}", playlist)));
+                HttpResponse::NotFound().finish()
+            }
+        }
     }
 }
 
@@ -359,16 +363,19 @@ async fn get_video_part(
     file_part.push(app_state.video_path.clone());
     file_part.push(part);
     // TODO: Do we need to guard against directory attacks here?
-    if let Ok(file) = NamedFile::open(&file_part) {
-        span.set_status(Status::Ok);
-        file.into_response(&request)
-    } else {
-        error!("Video part not found: {:?}", file_part);
-        span.set_status(Status::error(format!(
-            "Video part not found '{}'",
-            file_part.to_str().unwrap()
-        )));
-        HttpResponse::NotFound().finish()
+    match NamedFile::open(&file_part) {
+        Ok(file) => {
+            span.set_status(Status::Ok);
+            file.into_response(&request)
+        }
+        _ => {
+            error!("Video part not found: {:?}", file_part);
+            span.set_status(Status::error(format!(
+                "Video part not found '{}'",
+                file_part.to_str().unwrap()
+            )));
+            HttpResponse::NotFound().finish()
+        }
     }
 }