chore: WIP: fix merge

src/read.rs

@@ -770,13 +770,7 @@ pub(crate) fn central_header_to_zip_file<R: Read + Seek>(
 }
 
 /// Parse a central directory entry to collect the information for the file.
-fn central_header_to_zip_file_inner<R: Read>(
-    reader: &mut R,
-    archive_offset: u64,
-    central_header_start: u64,
-) -> ZipResult<ZipFileData> {
-/// Parse a central directory entry to collect the information for the file.
-fn central_header_to_zip_file_inner<R: Read>(
+fn central_header_to_zip_file_inner<R: Read + Seek>(
     reader: &mut R,
     archive_offset: u64,
     central_header_start: u64,

src/read/stream.rs

@@ -1,5 +1,5 @@
 use std::fs;
-use std::io::{self, Read};
+use std::io::{self, Read, Seek};
 use std::path::{Path, PathBuf};
 
 use super::{
@@ -20,7 +20,7 @@ impl<R> ZipStreamReader<R> {
     }
 }
 
-impl<R: Read> ZipStreamReader<R> {
+impl<R: Read + Seek> ZipStreamReader<R> {
     fn parse_central_directory(&mut self) -> ZipResult<Option<ZipStreamFileMetadata>> {
         // Give archive_offset and central_header_start dummy value 0, since
         // they are not used in the output.

src/write.rs

@@ -1562,7 +1562,9 @@ fn write_central_directory_header<T: Write>(writer: &mut T, file: &ZipFileData)
     let offset = file.header_start.min(spec::ZIP64_BYTES_THR) as u32;
 
     let mut extra_field = zip64_extra_field[..zip64_extra_field_length as usize].to_vec();
-    extra_field.extend_from_slice(&file.extra_field[..]);
+    if let Some(extra) = file.extra_field {
+        extra_field.extend_from_slice(extra);
+    }
     #[allow(deprecated)]
     writer.write_u16::<LittleEndian>(file.compression_method.to_u16())?;
     // last mod file time + date
@@ -1609,7 +1611,7 @@ fn write_central_directory_header<T: Write>(writer: &mut T, file: &ZipFileData)
     let header = spec::CentralDirectoryHeader {
         version_made_by: (file.system as u16) << 8 | (file.version_made_by as u16),
         version_to_extract: file.version_needed(),
-        flags: spec::GeneralPurposeBitFlags(flags),
+        flags: spec::GeneralPurposeBitFlags(flag),
         compression_method,
         last_mod_time: file.last_modified_time.timepart(),
         last_mod_date: file.last_modified_time.datepart(),