rkjnsn/udf-replace - Change 6MN2P2F4ODEDBP26GXQQPBA2YALQFWRMKS6SO4D66NVG2ZREXWVQC

Support opening UDF image from a generic reader, not just a file

Created by rkjnsn on July 20, 2022

6MN2P2F4ODEDBP26GXQQPBA2YALQFWRMKS6SO4D66NVG2ZREXWVQC

Dependencies

In channels

main

Change contents

Insertion in src/main.rs at line 2 [4.266]
[3.114]
[3.114]
```
use std::fs::File;
```

Insertion in src/main.rs at line 25 [4.266]

[2.4689]

    let file = File::open(args.udf_image).expect("Failed to open UDF file");

Replacement in src/main.rs at line 28 [4.266]

B:BD[2.4710] → [2.4710:4802]

        udfread::UdfRead::open_file(&args.udf_image).expect("Failed to create UDF reader");

[2.4710]

[4.310]

        udfread::UdfRead::open_reader(&file).expect("Failed to create UDF reader");

Insertion in src/udfread.rs at line 5 [2.35]
[2.151]
[2.151]
```
use std::marker::PhantomData;
```
Replacement in src/udfread.rs at line 10 [2.35]
B:BD[2.219] → [2.219:239]
```
struct FileReader {
```
[2.219]
[2.239]
```
struct InputAdapter<R: Read + Seek> {
```
Replacement in src/udfread.rs at line 12 [2.35]
B:BD[2.283] → [2.283:299]
```
    file: File,
```
[2.283]
[2.299]
```
    reader: R,
```

Replacement in src/udfread.rs at line 15 [2.35]

B:BD[2.302] → [2.302:452]

impl FileReader {
    fn new(path: impl AsRef<Path>) -> std::io::Result<*mut c_includes::udfread_block_input> {
        let file = File::open(path)?;

[2.302]

[2.452]

impl<R: Read + Seek> InputAdapter<R> {
    fn new(reader: R) -> *mut c_includes::udfread_block_input {

Replacement in src/udfread.rs at line 22 [2.35]

B:BD[2.656] → [2.656:774]

        Ok(Box::into_raw(Box::<Self>::new(Self { funcs, file }))
            as *mut c_includes::udfread_block_input)

[2.656]

[2.774]

        Box::into_raw(Box::<Self>::new(Self { funcs, reader }))
            as *mut c_includes::udfread_block_input

Replacement in src/udfread.rs at line 31 [2.35]
B:BD[2.976] → [2.976:994]
```
        self.file
```
[2.976]
[2.994]
```
        self.reader
```

Replacement in src/udfread.rs at line 68 [2.35]

B:BD[2.2407] → [2.2407:2466]

            self.file.seek(SeekFrom::Start(byte_offset))?;

[2.2407]

[2.2466]

            self.reader.seek(SeekFrom::Start(byte_offset))?;

Replacement in src/udfread.rs at line 70 [2.35]

B:BD[2.2485] → [2.2485:2543]

                let bytes_read = self.file.read(buffer)?;

[2.2485]

[2.2543]

                let bytes_read = self.reader.read(buffer)?;

Replacement in src/udfread.rs at line 103 [2.35]
B:BD[2.3640] → [2.3640:3661]
```
pub struct UdfRead {
```
[2.3640]
[2.3661]
```
pub struct UdfRead<R: Read + Seek = File> {
```
Insertion in src/udfread.rs at line 105 [2.35]
[2.3700]
[2.3700]
```
    phantom: PhantomData<InputAdapter<R>>,
```

Replacement in src/udfread.rs at line 108 [2.35]

B:BD[2.3703] → [2.3703:3840]

impl UdfRead {
    pub fn open_file(path: impl AsRef<Path>) -> Option<UdfRead> {
        let file_reader = match FileReader::new(path) {

[2.3703]

[2.3840]

impl UdfRead<File> {
    pub fn open_file(path: impl AsRef<Path>) -> Option<Self> {
        let file = match File::open(path) {

Insertion in src/udfread.rs at line 117 [2.35]
[2.4005]
[2.4005]
```
        Self::open_reader(file)
    }
}
```

Insertion in src/udfread.rs at line 122 [2.35]

[2.4006]

impl<R: Read + Seek> UdfRead<R> {
    pub fn open_reader(reader: R) -> Option<UdfRead<R>> {
        let input_adapter = InputAdapter::new(reader);

Replacement in src/udfread.rs at line 132 [2.35]

B:BD[2.4135] → [2.4135:4226]

        let open_result = unsafe { c_includes::udfread_open_input(udfread, file_reader) };

[2.4135]

[2.4226]

        let open_result = unsafe { c_includes::udfread_open_input(udfread, input_adapter) };

Replacement in src/udfread.rs at line 140 [2.35]

B:BD[2.4403] → [2.4403:4437]

        Some(UdfRead { udfread })

[2.4403]

[2.4437]

        Some(UdfRead {
            udfread,
            phantom: PhantomData,
        })

Replacement in src/udfread.rs at line 147 [2.35]
B:BD[2.4446] → [2.4446:4470]
```
impl Drop for UdfRead {
```
[2.4446]
[2.4470]
```
impl<R: Read + Seek> Drop for UdfRead<R> {
```

Support opening UDF image from a generic reader, not just a file

Dependencies

In channels

Change contents

Insertion in src/main.rs at line 2 [4.266]

Insertion in src/main.rs at line 25 [4.266]

Replacement in src/main.rs at line 28 [4.266]

Insertion in src/udfread.rs at line 5 [2.35]

Replacement in src/udfread.rs at line 10 [2.35]

Replacement in src/udfread.rs at line 12 [2.35]

Replacement in src/udfread.rs at line 15 [2.35]

Replacement in src/udfread.rs at line 22 [2.35]

Replacement in src/udfread.rs at line 31 [2.35]

Replacement in src/udfread.rs at line 68 [2.35]

Replacement in src/udfread.rs at line 70 [2.35]

Replacement in src/udfread.rs at line 103 [2.35]

Insertion in src/udfread.rs at line 105 [2.35]

Replacement in src/udfread.rs at line 108 [2.35]

Insertion in src/udfread.rs at line 117 [2.35]

Insertion in src/udfread.rs at line 122 [2.35]

Replacement in src/udfread.rs at line 132 [2.35]

Replacement in src/udfread.rs at line 140 [2.35]

Replacement in src/udfread.rs at line 147 [2.35]