Add support for iterating over all tags #255
Conversation
| @@ -895,6 +898,18 @@ impl<R: Read + Seek> Decoder<R> { | |||
| self.get_tag(tag)?.into_string() | |||
| } | |||
|
|
|||
| pub fn tag_iter(&mut self) -> impl Iterator<Item = TiffResult<(Tag, ifd::Value)>> + '_ { | |||
| match self.image().ifd.as_ref() { | |||
| None => Either::Left(std::iter::empty()), | |||
There was a problem hiding this comment.
Do you know when this case happens? Wondering if we should return None or an error rather than an empty iterator
There was a problem hiding this comment.
I have no idea, honestly. I think from a developer perspective, it is more convenient to have an empty iterator instead of having to deal with an Option.
tests/encode_images.rs
Outdated
| .tag_iter() | ||
| .filter_map(Result::ok) | ||
| .collect::<Vec<_>>(); | ||
| all_tags.sort_by(|(t1, _), (t2, _)| t1.to_u16().cmp(&t2.to_u16())); |
There was a problem hiding this comment.
Nit: could probably use sort_by_key here
| pub fn tag_iter(&mut self) -> impl Iterator<Item = TiffResult<(Tag, ifd::Value)>> + '_ { | ||
| match self.image().ifd.as_ref() { | ||
| None => Either::Left(std::iter::empty()), | ||
| Some(ifd) => Either::Right(TagIter::new( |
There was a problem hiding this comment.
Rather than constructing a TagIter here, I think we could directly return:
ifd.clone().into_iter().map(...)There was a problem hiding this comment.
I tried but failed to make the borrow checker happy with this approach. Happy to change it if you can provide a working solution.
|
I noticed tests are failing on CI. However, they run fine on my local machine (MacBook Pro M1). Maybe something is architecture/platform-dependent in the decoder @fintelia? |
|
The CI works by merging the branch into main and testing the resulting version. You might have to merge the lest changes from main locally to get the same results? Edit: This is what's happening. Your branch is three commits behind: |
Closes #243