commit cc25bdc6ff549751651773933b35f91a5fd4fc57 · hauleth.dev/ptsd

+39

Cargo.lock

···

       156
       156
        
       checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"

     

       157
       157
        
       

     

       158
       158
        
       [[package]]

     

       159
       159
       +
       name = "byteorder"

     

       160
       160
       +
       version = "1.5.0"

     

       161
       161
       +
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       162
       162
       +
       checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"

     

       163
       163
       +
       

     

       164
       164
       +
       [[package]]

     

       159
       165
        
       name = "bytes"

     

       160
       166
        
       version = "1.5.0"

     

       161
       167
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     
···

       168
       174
        
       checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"

     

       169
       175
        
       dependencies = [

     

       170
       176
        
        "libc",

     

       177
       177
       +
       ]

     

       178
       178
       +
       

     

       179
       179
       +
       [[package]]

     

       180
       180
       +
       name = "cfb"

     

       181
       181
       +
       version = "0.7.3"

     

       182
       182
       +
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       183
       183
       +
       checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f"

     

       184
       184
       +
       dependencies = [

     

       185
       185
       +
        "byteorder",

     

       186
       186
       +
        "fnv",

     

       187
       187
       +
        "uuid",

     

       171
       188
        
       ]

     

       172
       189
        
       

     

       173
       190
        
       [[package]]

     
···

       287
       304
        
       ]

     

       288
       305
        
       

     

       289
       306
        
       [[package]]

     

       307
       307
       +
       name = "fnv"

     

       308
       308
       +
       version = "1.0.7"

     

       309
       309
       +
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       310
       310
       +
       checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"

     

       311
       311
       +
       

     

       312
       312
       +
       [[package]]

     

       290
       313
        
       name = "form_urlencoded"

     

       291
       314
        
       version = "1.2.1"

     

       292
       315
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     
···

       442
       465
        
       checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"

     

       443
       466
        
       

     

       444
       467
        
       [[package]]

     

       468
       468
       +
       name = "infer"

     

       469
       469
       +
       version = "0.15.0"

     

       470
       470
       +
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       471
       471
       +
       checksum = "cb33622da908807a06f9513c19b3c1ad50fab3e4137d82a78107d502075aa199"

     

       472
       472
       +
       dependencies = [

     

       473
       473
       +
        "cfb",

     

       474
       474
       +
       ]

     

       475
       475
       +
       

     

       476
       476
       +
       [[package]]

     

       445
       477
        
       name = "inventory"

     

       446
       478
        
       version = "0.3.14"

     

       447
       479
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     
···

       633
       665
        
        "clap",

     

       634
       666
        
        "color-eyre",

     

       635
       667
        
        "futures",

     

       668
       668
       +
        "infer",

     

       636
       669
        
        "libc",

     

       637
       670
        
        "regex",

     

       638
       671
        
        "serde",

     
···

       973
       1006
        
       version = "0.2.1"

     

       974
       1007
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       975
       1008
        
       checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"

     

       1009
       1009
       +
       

     

       1010
       1010
       +
       [[package]]

     

       1011
       1011
       +
       name = "uuid"

     

       1012
       1012
       +
       version = "1.6.1"

     

       1013
       1013
       +
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       1014
       1014
       +
       checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"

     

       976
       1015
        
       

     

       977
       1016
        
       [[package]]

     

       978
       1017
        
       name = "valuable"

Cargo.toml

···

       11
       11
        
       clap = { version = "4.4.16", features = ["derive"] }

     

       12
       12
        
       color-eyre = "0.6.2"

     

       13
       13
        
       futures = "0.3.30"

     

       14
       14
       +
       infer = { version = "0.15.0", default-features = false, features = ["alloc", "cfb"] }

     

       14
       15
        
       libc = "0.2.152"

     

       15
       16
        
       regex = "1.10.2"

     

       16
       17
        
       serde = { version = "1.0.195", features = ["derive"] }

+28 -7

src/filters.rs

···

       3
       3
        
       use async_trait::async_trait;

     

       4
       4
        
       use serde::Deserialize;

     

       5
       5
        
       

     

       6
       6
       -
       use tokio::io::{self, AsyncReadExt};

     

       7
       6
        
       use tokio::fs;

     

       7
       7
       +
       use tokio::io::{self, AsyncReadExt, AsyncSeekExt};

     

       8
       8
        
       

     

       9
       9
        
       use futures::prelude::*;

     

       10
       10
        
       

     
···

       156
       156
        
       #[serde(rename_all = "snake_case")]

     

       157
       157
        
       pub enum Magic {

     

       158
       158
        
           Mime(String),

     

       159
       159
       -
           Bytes(Box<[u8]>),

     

       159
       159
       +
           Magic {

     

       160
       160
       +
               bytes: Box<[u8]>,

     

       161
       161
       +
               #[serde(default)]

     

       162
       162
       +
               offset: u64,

     

       163
       163
       +
           },

     

       160
       164
        
       }

     

       161
       165
        
       

     

       162
       162
       -
       async fn read_first_bytes(n: usize, path: &Path) -> io::Result<Box<[u8]>> {

     

       166
       166
       +
       async fn read_first_bytes(n: usize, path: &Path, offset: u64) -> io::Result<Box<[u8]>> {

     

       167
       167
       +
           use std::io::SeekFrom;

     

       168
       168
       +
       

     

       163
       169
        
           let mut file = fs::File::open(path).await?;

     

       164
       170
        
       

     

       165
       171
        
           let mut buf = vec![0; n];

     

       166
       172
        
       

     

       173
       173
       +
           file.seek(SeekFrom::Start(offset)).await?;

     

       167
       174
        
           file.read_exact(&mut buf).await?;

     

       168
       175
        
       

     

       169
       176
        
           Ok(buf.into())

     

       170
       177
        
       }

     

       171
       178
        
       

     

       179
       179
       +
       async fn guess_mime(path: &Path) -> Option<infer::Type> {

     

       180
       180
       +
           let mut file = fs::File::open(path).await.ok()?;

     

       181
       181
       +
       

     

       182
       182
       +
           let mut buf = vec![0; 8192];

     

       183
       183
       +
       

     

       184
       184
       +
           let len = file.read(&mut buf).await.ok()?;

     

       185
       185
       +
       

     

       186
       186
       +
           infer::get(&buf[0..len])

     

       187
       187
       +
       }

     

       188
       188
       +
       

     

       172
       189
        
       #[typetag::deserialize(name = "content_type")]

     

       173
       190
        
       #[async_trait]

     

       174
       191
        
       impl Filter for Magic {

     

       175
       192
        
           async fn matches(&self, file: &Path) -> bool {

     

       176
       193
        
               match *self {

     

       177
       177
       -
                   Magic::Bytes(ref bytes) => {

     

       178
       178
       -
                       read_first_bytes(bytes.len(), file).await.map(|read| read == *bytes).unwrap_or(false)

     

       179
       179
       -
                   },

     

       180
       180
       -
                   Magic::Mime(_) => unimplemented!()

     

       194
       194
       +
                   Magic::Magic { ref bytes, offset } => read_first_bytes(bytes.len(), file, offset)

     

       195
       195
       +
                       .await

     

       196
       196
       +
                       .map(|read| read == *bytes)

     

       197
       197
       +
                       .unwrap_or(false),

     

       198
       198
       +
                   Magic::Mime(ref mime_type) => guess_mime(file)

     

       199
       199
       +
                       .await

     

       200
       200
       +
                       .map(|typ| typ.mime_type() == mime_type)

     

       201
       201
       +
                       .unwrap_or(false),

     

       181
       202
        
               }

     

       182
       203
        
           }

     

       183
       204
        
       }