cleanup

Author: alvinometric

src/jpeg.rs

@@ -1,6 +1,7 @@
 use crate::reader::ReadUtils;
 use crate::reader::read_iptc_data;
 use crate::tags;
+use crate::tags::TagsMap;
 
 use std::collections::HashMap;
 use std::error::Error;
@@ -220,18 +221,7 @@ impl JPEGReader {
     }
 
     fn get_record_dataset(tag: &IPTCTag) -> Option<(u8, u8)> {
-        match tag {
-            IPTCTag::City => Some((2, 90)),
-            IPTCTag::Keywords => Some((2, 25)),
-            IPTCTag::ByLine => Some((2, 80)),
-            IPTCTag::Caption => Some((2, 120)),
-            IPTCTag::CopyrightNotice => Some((2, 116)),
-            IPTCTag::Credit => Some((2, 110)),
-            IPTCTag::Headline => Some((2, 105)),
-            IPTCTag::ObjectName => Some((2, 5)),
-            IPTCTag::Source => Some((2, 115)),
-            IPTCTag::Urgency => Some((2, 10)),
-            _ => None,
-        }
+        let tags_map = TagsMap::new();
+        tags_map.get_record_dataset(tag)
     }
 }

src/tags.rs

@@ -82,6 +82,7 @@ pub(crate) type TagBlock = (IPTCTag, bool, ParseFn);
 
 pub(crate) struct TagsMap {
     map: HashMap<String, TagBlock>,
+    reverse_map: HashMap<IPTCTag, (u8, u8)>,
 }
 
 fn default_parse(s: String) -> String {
@@ -202,10 +203,25 @@ impl TagsMap {
         .map(|(k, v)| (k.to_string(), v))
         .collect();
 
-        TagsMap { map }
+        // Create reverse map from tag to (record,dataset)
+        let reverse_map = map
+            .iter()
+            .map(|(k, &(tag, _, _))| {
+                let parts: Vec<&str> = k.split(':').collect();
+                let record = parts[0].parse::<u8>().unwrap();
+                let dataset = parts[1].parse::<u8>().unwrap();
+                (tag, (record, dataset))
+            })
+            .collect();
+
+        TagsMap { map, reverse_map }
     }
 
     pub(crate) fn get(&self, tag: String) -> Option<TagBlock> {
         self.map.get(&tag).copied()
     }
+
+    pub(crate) fn get_record_dataset(&self, tag: &IPTCTag) -> Option<(u8, u8)> {
+        self.reverse_map.get(tag).copied()
+    }
 }