andrey/album
1
0
Fork 0
Code Issues 10 Pull Requests Packages Projects Releases Wiki Activity

Exif may miss actual image size.

Browse Source 
If so, load actual image to find out.  Also some refactoring.
This commit is contained in:
Rasmus Kaj 2020-05-14 21:18:43 +02:00
parent 2bbb899272
commit 220b65a479
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/photosdir.rs
View File

@ -73,14 +73,8 @@ impl PhotosDir {
let path = entry?.path();
if fs::metadata(&path)?.is_dir() {
self.find_files(&path, cb)?;
} else if let Ok(exif) = ExifData::read_from(&path) {
} else if let Some(exif) = load_meta(&path) {
cb(self.subpath(&path)?, &exif);
} else if let Ok(image) = image::open(&path) {
let mut meta = ExifData::default();
meta.width = Some(image.width());
meta.height = Some(image.height());
info!("{:?} seems like a pic with no exif.", path);
cb(self.subpath(&path)?, &meta);
} else {
debug!("{:?} is no pic.", path)
}
@ -101,3 +95,27 @@ impl PhotosDir {
})
}
}
fn load_meta(path: &Path) -> Option<ExifData> {
if let Ok(mut exif) = ExifData::read_from(&path) {
if exif.width.is_none() || exif.height.is_none() {
if let Ok((width, height)) = actual_image_size(&path) {
exif.width = Some(width);
exif.height = Some(height);
}
}
Some(exif)
} else if let Ok((width, height)) = actual_image_size(&path) {
let mut meta = ExifData::default();
meta.width = Some(width);
meta.height = Some(height);
Some(meta)
} else {
None
}
}
fn actual_image_size(path: &Path) -> Result<(u32, u32), ImageError> {
let image = image::open(&path)?;
return Ok((image.width(), image.height()));
}