]> git.datanom.net - lensdb.git/blobdiff - lib/main.cpp
Readd missing feature
[lensdb.git] / lib / main.cpp
index e957f1b9193eecf75928c30928532c6c2264c81c..d8a5c1e7eaaac44a960f6f5e43e72d8e469fa84f 100644 (file)
@@ -4,6 +4,52 @@
 
 using namespace std;
 
+static const char* LensMakers[] = {
+               "7Artisans",
+               "Canon",
+               "Carl Zeiss",
+               "Chinon",
+               "Cosina",
+               "Essilor",
+               "EssilorLuxottica",
+               "Fujifilm",
+               "Goerz",
+               "Hoya",
+               "Kenko",
+               "Konica",
+               "Leica",
+               "Leidolf",
+               "Lumix",
+               "Meopta",
+               "Meyer Optik Görlitz",
+               "Minolta",
+               "Nikon",
+               "Nisi",
+               "Olympus",
+               "OM Digital Solutions",
+               "Pentacon",
+               "Pentax",
+               "Pergear",
+               "Rodenstock",
+               "Samyang",
+               "Schneider Kreuznach",
+               "Seagull",
+               "Seiko",
+               "Sigma",
+               "Silor",
+               "Schneider Kreuznach",
+               "Soligor",
+               "Sony",
+               "Tamron",
+               "Tokina",
+               "Topcon",
+               "TTArtisan",
+               "Yongnuo",
+               "Viltrox",
+               "Voigtländer",
+               NULL
+};
+
 static void print_all(gpointer key, gpointer value, gpointer user_data) {
        cout << (gchar*)key << " = " << (gchar*)value << endl;
 }
@@ -51,22 +97,51 @@ string ExifScanner::get_maker() {
        string maker;
        
        //g_hash_table_foreach(exif_tags, print_all, NULL);
-       const gchar* lensId = (gchar *)g_hash_table_lookup(exif_tags, "LensMake");
-       if (!lensId) {
+       gchar* lensId = g_strdup((gchar *)g_hash_table_lookup(exif_tags, "LensMake"));
+       gulong len = char_len(lensId);
+       if (!lensId || g_strcmp0("Unknown (2822)", lensId) == 0 || len < 1) {
                const gchar* s = (gchar *)g_hash_table_lookup(exif_tags, "LensID");
+               if (s && g_strcmp0("Unknown (2822)", s) != 0) {
+                       gchar* pos = g_strstr_len(s, -1, " ");
+                       //cout << pos << endl;
+                       if (pos) {
+                               //cout << "S length: " << strlen(s) << "POS length: " << strlen(pos) << endl;
+                               g_free(lensId);
+                               lensId = g_strndup(s, strlen(s) - strlen(pos));
+                       }
+                       len = g_utf8_strlen(lensId, -1);
+               }
+       }
+
+       if (match_maker(lensId) == false) {
+               g_free(lensId);
+               lensId = NULL;
+       }
+       
+       if (!lensId || g_strcmp0("Unknown (2822)", lensId) == 0 || len < 1) {
+               const gchar* s = (gchar *)g_hash_table_lookup(exif_tags, "LensModel");
                if (s) {
                        gchar* pos = g_strstr_len(s, -1, " ");
                        //cout << pos << endl;
                        if (pos) {
                                //cout << "S length: " << strlen(s) << "POS length: " << strlen(pos) << endl;
+                               g_free(lensId);
                                lensId = g_strndup(s, strlen(s) - strlen(pos));
+                               len = char_len(lensId);
                        }
                }
        }
-       if (!lensId)
-               maker = get_cscring("Unknown");
+
+       if (match_maker(lensId) == false) {
+               g_free(lensId);
+               lensId = NULL;
+       }
+
+       if (!lensId || len < 1)
+               maker = get_cstring("Unknown");
        else
-               maker = get_cscring(lensId);
+               maker = get_cstring(lensId);
+       g_free(lensId);
        
        return maker;
 }
@@ -75,14 +150,16 @@ string ExifScanner::get_serial_number() {
        string sn;
 
        const gchar* id = (gchar *)g_hash_table_lookup(exif_tags, "LensSerialNumber");
-       if (!id) {
+       gulong len = char_len(id);
+       if (!id || len < 1) {
                id = (gchar *)g_hash_table_lookup(exif_tags, "SerialNumber");
+               len = char_len(id);
        }
        
-       if (!id)
-               sn = get_cscring("Unknown");
+       if (!id || len < 1)
+               sn = get_cstring("Unknown");
        else
-               sn = get_cscring(id);
+               sn = get_cstring(id);
        
        return sn;
 }
@@ -91,22 +168,50 @@ string ExifScanner::get_lens() {
        string lens;
 
        const gchar* lensId = (gchar *)g_hash_table_lookup(exif_tags, "LensID");
-       if (!lensId) {
+       gulong len = char_len(lensId);
+       if (!lensId || g_strcmp0("Unknown (2822)", lensId) == 0 || len < 1) {
                lensId = (gchar *)g_hash_table_lookup(exif_tags, "LensModel");
-               if (!lensId)
+               len = char_len(lensId);
+               if (!lensId || g_strcmp0("Unknown (2822)", lensId) == 0 || len < 1) {
                        lensId = (gchar *)g_hash_table_lookup(exif_tags, "LensSpec");
+                       len = char_len(lensId);
+               }
        }
        
-       if (!lensId)
-               lens = get_cscring("Unknown");
+       if (!lensId || g_strcmp0("Unknown (2822)", lensId) == 0 || len < 1)
+               lens = get_cstring("Unknown");
        else
-               lens = get_cscring(lensId);
+               lens = get_cstring(lensId);
        
        return lens;
 }
 
-gchar* ExifScanner::get_cscring(string s) {
+gchar* ExifScanner::get_cstring(string s) {
        gchar* cstring = g_strdup(s.c_str());
        
        return cstring;
 }
+
+bool ExifScanner::match_maker(const gchar* maker) {
+       int i = 0;
+       const char* lensmaker = NULL;
+       
+       if (maker == NULL) return false;
+       
+       lensmaker = LensMakers[i];
+       while (lensmaker) {
+               if (g_ascii_strcasecmp(lensmaker, maker) == 0) {
+                       return true;
+               }
+               i++;
+               lensmaker = LensMakers[i];
+       }
+       
+       return false;
+}
+
+gulong ExifScanner::char_len(const gchar* elem) {
+       if (!elem) return 0;
+       
+       return g_utf8_strlen(elem, -1);
+}
This page took 0.485405 seconds and 5 git commands to generate.