Implementing some usefull data structures for lua

diff --git a/src/lua.c b/src/lua.c
index 469e1c6..84f3ff5 100644 (file)
--- a/src/lua.c
+++ b/src/lua.c
@@ -22,12 +22,16 @@
 
 #ifdef HAVE_LUA
 
+#define _XOPEN_SOURCE
+
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
 
 #include <stdio.h>
 #include <glib.h>
+#include <string.h>
+#include <time.h>
 
 #include "main.h"
 #include "glua.h"
@@ -46,28 +50,115 @@ static FileData *lua_check_image(lua_State *L, int index)
        return *fd;
 }
 
+static int lua_image_get_exif(lua_State *L)
+{
+       FileData *fd;
+       ExifData *exif;
+       ExifData **exif_data;
+
+       fd = lua_check_image(L, 1);
+       exif = exif_read_fd(fd);
+
+       exif_data = (ExifData **)lua_newuserdata(L, sizeof(ExifData *));
+       luaL_getmetatable(L, "Exif");
+       lua_setmetatable(L, -2);
+
+       *exif_data = exif;
+
+       return 1;
+}
+
+static int lua_image_get_path(lua_State *L)
+{
+       FileData *fd;
+
+       fd = lua_check_image(L, 1);
+       lua_pushstring(L, fd->path);
+       return 1;
+}
+
+static int lua_image_get_name(lua_State *L)
+{
+       FileData *fd;
+
+       fd = lua_check_image(L, 1);
+       lua_pushstring(L, fd->name);
+       return 1;
+}
+
+static int lua_image_get_extension(lua_State *L)
+{
+       FileData *fd;
+
+       fd = lua_check_image(L, 1);
+       lua_pushstring(L, fd->extension);
+       return 1;
+}
+
+static int lua_image_get_date(lua_State *L)
+{
+       FileData *fd;
+
+       fd = lua_check_image(L, 1);
+       lua_pushnumber(L, fd->date);
+       return 1;
+}
+
+static int lua_image_get_size(lua_State *L)
+{
+       FileData *fd;
+
+       fd = lua_check_image(L, 1);
+       lua_pushnumber(L, fd->size);
+       return 1;
+}
+
+static ExifData *lua_check_exif(lua_State *L, int index)
+{
+       ExifData **exif;
+       luaL_checktype(L, index, LUA_TUSERDATA);
+       exif = (ExifData **)luaL_checkudata(L, index, "Exif");
+       if (exif == NULL) luaL_typerror(L, index, "Exif");
+       return *exif;
+}
+
 /* Interface for EXIF data */
 static int lua_exif_get_datum(lua_State *L)
 {
        const gchar *key;
        gchar *value = NULL;
        ExifData *exif;
-       FileData *fd;
+       struct tm tm;
+       time_t datetime;
 
-       fd = lua_check_image(L, 1);
+       exif = lua_check_exif(L, 1);
        key = luaL_checkstring(L, 2);
        if (key == (gchar*)NULL || key[0] == '\0')
                {
                lua_pushnil(L);
                return 1;
                }
-       exif = exif_read_fd(fd);
        if (!exif)
                {
                lua_pushnil(L);
                return 1;
                }
        value = exif_get_data_as_text(exif, key);
+       if (strcmp(key, "Exif.Photo.DateTimeOriginal") == 0)
+               {
+               memset(&tm, 0, sizeof(tm));
+               if (value && strptime(value, "%Y:%m:%d %H:%M:%S", &tm))
+                       {
+                       datetime = mktime(&tm);
+                       lua_pushnumber(L, datetime);
+                       return 1;
+                       }
+               else
+                       {
+                       lua_pushnil(L);
+                       return 1;
+                       }
+               } // if (strcmp(key, "Exif.Photo.Da...
        lua_pushstring(L, value);
        return 1;
 }
@@ -81,11 +172,48 @@ void lua_init(void)
        luaL_openlibs(L); /* Open all libraries for lua programms */
 
        /* Now create custom methodes to do something */
+       static const luaL_Reg meta_methods[] = {
+                       {NULL, NULL}
+       };
+
+       /* The Image metatable and methodes */
+       static const luaL_Reg image_methods[] = {
+                       {"get_path", lua_image_get_path},
+                       {"get_name", lua_image_get_name},
+                       {"get_extension", lua_image_get_extension},
+                       {"get_date", lua_image_get_date},
+                       {"get_size", lua_image_get_size},
+                       {"get_exif", lua_image_get_exif},
+                       {NULL, NULL}
+       };
+       luaL_register(L, "Image", image_methods);
+       luaL_newmetatable(L, "Image");
+       luaL_register(L, NULL, meta_methods);
+       lua_pushliteral(L, "__index");
+       lua_pushvalue(L, -3);
+       lua_settable(L, -3);
+       lua_pushliteral(L, "__metatable");
+       lua_pushvalue(L, -3);
+       lua_settable(L, -3);
+       lua_pop(L, 1);
+       lua_pop(L, 1);
+
+       /* The Exif table and methodes */
        static const luaL_Reg exif_methods[] = {
                        {"get_datum", lua_exif_get_datum},
                        {NULL, NULL}
        };
        luaL_register(L, "Exif", exif_methods);
+       luaL_newmetatable(L, "Exif");
+       luaL_register(L, NULL, meta_methods);
+       lua_pushliteral(L, "__index");
+       lua_pushvalue(L, -3);
+       lua_settable(L, -3);
+       lua_pushliteral(L, "__metatable");
+       lua_pushvalue(L, -3);
+       lua_settable(L, -3);
+       lua_pop(L, 1);
+       lua_pop(L, 1);
 }
 
 /**
@@ -97,14 +225,21 @@ gchar *lua_callvalue(FileData *fd, const gchar *file, const gchar *function)
        gchar *data = NULL;
        gchar *dir;
        gchar *path;
-       FileData **user_data;
+       FileData **image_data;
+       gchar *tmp;
+       GError *error = NULL;
 
-       user_data = (FileData **)lua_newuserdata(L, sizeof(FileData *));
-       luaL_newmetatable(L, "Image");
-       //luaL_getmetatable(L, "Image");
+       /* Collection Table (Dummy at the moment) */
+       lua_newtable(L);
+       lua_setglobal(L, "Collection");
+
+       /* Current Image */
+       image_data = (FileData **)lua_newuserdata(L, sizeof(FileData *));
+       luaL_getmetatable(L, "Image");
        lua_setmetatable(L, -2);
        lua_setglobal(L, "Image");
-       *user_data = fd;
+
+       *image_data = fd;
        if (file[0] == '\0')
                {
                result = luaL_dostring(L, function);
@@ -124,6 +259,17 @@ gchar *lua_callvalue(FileData *fd, const gchar *file, const gchar *function)
                return data;
                }
        data = g_strdup(lua_tostring(L, -1));
+       tmp = g_locale_to_utf8(data, strlen(data), NULL, NULL, &error);
+       if (error)
+               {
+               log_printf("Error converting lua output from locale to UTF-8: %s\n", error->message);
+               g_error_free(error);
+               }
+       else
+               {
+               g_free(data);
+               data = g_strdup(tmp);
+               } // if (error) { ... } else
        return data;
 }