diff --git a/backend/src/main.rs b/backend/src/main.rs index 6b0038c..7ca76af 100644 --- a/backend/src/main.rs +++ b/backend/src/main.rs @@ -1,10 +1,8 @@ use crate::settings::CONFIG; use axum::{Router, routing::get}; use log::{LevelFilter, debug, info}; -use rusqlite::Connection; -use std::net::SocketAddr; use std::sync::{Arc, Mutex}; -use tokio::time::{self, Duration, sleep}; +use tokio::time::{Duration, sleep}; use tower_http::services::ServeDir; mod db; @@ -34,9 +32,7 @@ async fn main() -> Result<(), String> { // Now onto the important stuff info!("Starting up oott"); - let result = tokio::join!(scanner(), web_server()); - - Ok(()) + tokio::join!(scanner(), web_server()).0 } async fn web_server() -> Result<(), String> { diff --git a/backend/web/flutter_bootstrap.js b/backend/web/flutter_bootstrap.js index 291781c..8b5f795 100644 --- a/backend/web/flutter_bootstrap.js +++ b/backend/web/flutter_bootstrap.js @@ -38,6 +38,6 @@ _flutter.buildConfig = {"engineRevision":"587c18f873b8ab57330422bce09047420d9c7f _flutter.loader.load({ serviceWorkerSettings: { - serviceWorkerVersion: "3023458089" + serviceWorkerVersion: "1540450131" } }); diff --git a/backend/web/flutter_service_worker.js b/backend/web/flutter_service_worker.js index 55bad1c..7142383 100644 --- a/backend/web/flutter_service_worker.js +++ b/backend/web/flutter_service_worker.js @@ -3,37 +3,37 @@ const MANIFEST = 'flutter-app-manifest'; const TEMP = 'flutter-temp-cache'; const CACHE_NAME = 'flutter-app-cache'; -const RESOURCES = {"version.json": "281c5c875c5b5aa08d839f46f24b31ed", -"canvaskit/skwasm_heavy.js": "740d43a6b8240ef9e23eed8c48840da4", -"canvaskit/skwasm.js": "8060d46e9a4901ca9991edd3a26be4f0", -"canvaskit/skwasm_heavy.wasm": "b0be7910760d205ea4e011458df6ee01", -"canvaskit/canvaskit.js.symbols": "a3c9f77715b642d0437d9c275caba91e", -"canvaskit/canvaskit.js": "8331fe38e66b3a898c4f37648aaf7ee2", -"canvaskit/skwasm_heavy.js.symbols": "0755b4fb399918388d71b59ad390b055", -"canvaskit/skwasm.wasm": "7e5f3afdd3b0747a1fd4517cea239898", +const RESOURCES = {"flutter.js": "24bc71911b75b5f8135c949e27a2984e", +"manifest.json": "906fc433ff2f17c2c8af10ca573ca807", +"main.dart.js": "95aa19037165ce33caf0d7429c6ae8a1", "canvaskit/canvaskit.wasm": "9b6a7830bf26959b200594729d73538e", +"canvaskit/skwasm.js": "8060d46e9a4901ca9991edd3a26be4f0", +"canvaskit/skwasm.wasm": "7e5f3afdd3b0747a1fd4517cea239898", +"canvaskit/skwasm_heavy.js": "740d43a6b8240ef9e23eed8c48840da4", +"canvaskit/skwasm_heavy.js.symbols": "0755b4fb399918388d71b59ad390b055", +"canvaskit/canvaskit.js.symbols": "a3c9f77715b642d0437d9c275caba91e", +"canvaskit/skwasm_heavy.wasm": "b0be7910760d205ea4e011458df6ee01", +"canvaskit/skwasm.js.symbols": "3a4aadf4e8141f284bd524976b1d6bdc", +"canvaskit/canvaskit.js": "8331fe38e66b3a898c4f37648aaf7ee2", +"canvaskit/chromium/canvaskit.wasm": "a726e3f75a84fcdf495a15817c63a35d", "canvaskit/chromium/canvaskit.js.symbols": "e2d09f0e434bc118bf67dae526737d07", "canvaskit/chromium/canvaskit.js": "a80c765aaa8af8645c9fb1aae53f9abf", -"canvaskit/chromium/canvaskit.wasm": "a726e3f75a84fcdf495a15817c63a35d", -"canvaskit/skwasm.js.symbols": "3a4aadf4e8141f284bd524976b1d6bdc", -"flutter.js": "24bc71911b75b5f8135c949e27a2984e", -"manifest.json": "906fc433ff2f17c2c8af10ca573ca807", -"flutter_bootstrap.js": "67c0846e6954093fc5187cfd23f54b37", -"main.dart.js": "95aa19037165ce33caf0d7429c6ae8a1", -"icons/Icon-192.png": "ac9a721a12bbc803b44f645561ecb1e1", -"icons/Icon-maskable-192.png": "c457ef57daa1d16f64b27b786ec2ea3c", -"icons/Icon-512.png": "96e752610906ba2a93c65f8abe1645f1", -"icons/Icon-maskable-512.png": "301a7604d45b3e739efc881eb04896ea", -"index.html": "924e12d6bcb7e0caa0a59ed2142a82e9", -"/": "924e12d6bcb7e0caa0a59ed2142a82e9", -"assets/shaders/stretch_effect.frag": "40d68efbbf360632f614c731219e95f0", -"assets/shaders/ink_sparkle.frag": "ecc85a2e95f5e9f53123dcaf8cb9b6ce", -"assets/AssetManifest.bin": "0b0a3415aad49b6e9bf965ff578614f9", -"assets/fonts/MaterialIcons-Regular.otf": "ab59d1be110caf774c1cb73eee4b4e92", -"assets/NOTICES": "063a0f7f8219ec492f1f62d477b3f49d", +"index.html": "8e2698cd673be581425722f1ddee0d60", +"/": "8e2698cd673be581425722f1ddee0d60", "assets/FontManifest.json": "7b2a36307916a9721811788013e65289", "assets/AssetManifest.bin.json": "a1fee2517bf598633e2f67fcf3e26c94", -"favicon.png": "5dcef449791fa27946b3d35ad8803796"}; +"assets/shaders/stretch_effect.frag": "40d68efbbf360632f614c731219e95f0", +"assets/shaders/ink_sparkle.frag": "ecc85a2e95f5e9f53123dcaf8cb9b6ce", +"assets/fonts/MaterialIcons-Regular.otf": "ab59d1be110caf774c1cb73eee4b4e92", +"assets/AssetManifest.bin": "0b0a3415aad49b6e9bf965ff578614f9", +"assets/NOTICES": "063a0f7f8219ec492f1f62d477b3f49d", +"version.json": "281c5c875c5b5aa08d839f46f24b31ed", +"favicon.png": "5dcef449791fa27946b3d35ad8803796", +"flutter_bootstrap.js": "aade3e61fa4fe17c015bc83aae2ef806", +"icons/Icon-192.png": "ac9a721a12bbc803b44f645561ecb1e1", +"icons/Icon-512.png": "96e752610906ba2a93c65f8abe1645f1", +"icons/Icon-maskable-512.png": "301a7604d45b3e739efc881eb04896ea", +"icons/Icon-maskable-192.png": "c457ef57daa1d16f64b27b786ec2ea3c"}; // The application shell files that are downloaded before a service worker can // start. const CORE = ["main.dart.js", diff --git a/backend/web/index.html b/backend/web/index.html index 28898a2..a5fa1e8 100644 --- a/backend/web/index.html +++ b/backend/web/index.html @@ -14,7 +14,7 @@ This is a placeholder for base href that will be replaced by the value of the `--base-href` argument provided to `flutter build`. --> - +