| -rw-r--r-- | COPYING | 2 | ||||
| -rw-r--r-- | NEWS.xml | 8 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/iiid.8.in | 2 |
4 files changed, 11 insertions, 3 deletions
@@ -1,19 +1,19 @@ -Copyright (c) 2009-2010 Klever Group (http://www.klever.net/) +Copyright (c) 2009-2011 Klever Group (http://www.klever.net/) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -1,10 +1,18 @@ <?xml version="1.0" encoding="us-ascii"?> <news> + <version version="0.2" date="March ??th, 2011"> + <ni>improved compatibility with Geo X2 card</ni> + <ni>extract and store .log files supplied for geotagging purpose</ni> + <ni>added script for post-processing uploaded photo (sort by exif + timestamp)</ni> + <ni>added utility to extract chunks from RIFF (video) files to assist in + automatic sorting of videos</ni> + </version> <version version="0.1" date="April 5th, 2009"> <ni>integrity digest verification</ni> <ni>try to create upload directory if it doesn't exist</ni> </version> <version version="0.0" date="March 8th, 2009"> <ni>Initial release</ni> </version> </news> diff --git a/configure.ac b/configure.ac index a719cdd..d580f58 100644 --- a/configure.ac +++ b/configure.ac @@ -1,75 +1,75 @@ -AC_INIT([iii], [0.1], [iii-bugs@klever.net]) +AC_INIT([iii], [0.2], [iii-bugs@klever.net]) AC_CONFIG_SRCDIR([src/iiid.cc]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([dist-bzip2]) AC_PROG_INSTALL AC_PROG_CXX AC_PROG_CC PKG_PROG_PKG_CONFIG AC_HEADER_STDC AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) PKG_CHECK_MODULES([MODULES],[gsoap++ openssl libconfuse]) PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false]) AM_CONDITIONAL([HAVE_UUID],[$have_uuid]) if $have_uuid ; then AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid]) AC_SUBST([UUID_UUID],[uuid]) fi AC_PATH_PROG([SOAPCPP2],[soapcpp2],[false]) test "$SOAPCPP2" = "false" && AC_MSG_ERROR([no soapcpp2 tool, part of gsoap package, found.]) notfound=false AC_CHECK_HEADERS([archive.h],[ AC_CHECK_LIB([archive],[archive_read_new],,[notfound=true]) ],[notfound=true]) $notfound && AC_MSG_ERROR([no required libarchive library found. get one from http://people.freebsd.org/~kientzle/libarchive/]) notfound=false AC_LANG_PUSH([C++]) AC_CHECK_HEADERS([autosprintf.h],[ AC_CHECK_LIB([asprintf],[main],,[notfound=true]) ],[notfound=true]) $notfound && AC_MSG_ERROR([no autosprintf, part of gettext, found]) AC_LANG_POP([C++]) nitpick=false AC_ARG_ENABLE([nitpicking], AC_HELP_STRING([--enable-nitpicking],[make compiler somewhat overly fastidious about the code it deals with]), [ test "$enableval" = "no" || nitpick=true ] ) if $nitpick ; then CPP_NITPICK="-pedantic -Wall -Wextra -Wundef -Wshadow \ -Wunsafe-loop-optimizations -Wconversion -Wmissing-format-attribute \ -Wredundant-decls -ansi -Wlogical-op -Wmissing-noreturn" C_NITPICK="$CPP_NITPICK" CXX_NITPICK="$C_NITPICK" CPPFLAGS="$CPPFLAGS $CPP_NITPICK" CFLAGS="$CFLAGS $C_NITPICK" CXXFLAGS="$CXXFLAGS $CXX_NITPICK" fi ndebug=true AC_ARG_ENABLE([debug], AC_HELP_STRING([--enable-debug],[enable debugging code]), [ test "$enableval" = "no" || ndebug=false ] ) if $ndebug ; then CPPFLAGS_DEBUG="-DNDEBUG" else CPPFLAGS_DEBUG="-DDEBUG" fi AC_SUBST([CPPFLAGS_DEBUG]) AC_CONFIG_FILES([ Makefile src/Makefile doc/Makefile doc/iiid.8 ]) AC_OUTPUT diff --git a/doc/iiid.8.in b/doc/iiid.8.in index 63a941e..533ed18 100644 --- a/doc/iiid.8.in +++ b/doc/iiid.8.in @@ -1,106 +1,106 @@ .TH iiid 8 "March 8th, 2009" "iiid(8)" "Klever Group (http://www.klever.net/)" .hla en .SH NAME iiid \- An eye-fi card management daemon .SH SYNOPSYS \fBiiid\fR [\fB-h\fR] [\fB--help\fR] [\fB--usage\fR] [\fB-V\fR] [\fB--version\fR] [\fB-L\fR] [\fB--license\fR] [\fB-p\fR \fIport\fR] [\fB--port=\fR\fIport\fR] .SH DESCRIPTION iiid daemon is a minimalistic open source eye-fi management daemon implementation. It is listening for incoming connections and accepts files from eye-fi card, optionally invoking scripts to sort out files or send out notifications. .SH OPTIONS .TP \fB-p\fR \fIport\fR, \fB--port=\fR\fIport\fR Set the port to listen to. You're not likely to ever need to change this, perhaps for debugging purpose or if you want to proxy connections. .TP \fB-h\fR, \fB--help\fR, \fB--usage\fR Display short usage instructions and exit. .TP \fB-V\fR, \fB--version\fR Report version and exit. .TP \fB-L\fR, \fB--license\fR Show licensing terms. .SH EXIT STATUS The daemon isn't supposed to exit at this point, but, like most executables, it returns zero in case of success, non-zero otherwise. .SH FILES .TP @sysconfdir@/iii/\fBXXXXXXXXXXXX.conf/fR Upon successfull connection, the daemon reads the configuration from this file, where XXXXXXXXXXXX is the macaddress of your eyefi card. You can lookup the mac address of your card in your Mac/Windows Settings.xml file. Be sure to remove dashes from it. .SH CONFIGURATION OPTIONS .TP \fBtargetdir\fR = "\fI/var/lib/iii/%s/\fR" Sets the target directory for uploaded files. If the \fI%s\fR placeholder is present in the string, it is replaced with card mac address. .TP \fBuploadkey\fR = "\fIxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\fR" The upload key as seen in Mac/Windows Settings.xml file. .TP \fBon-start-session\fR = "\fIlogger iii-StartSession ${EYEFI_MACADDRESS} ${EYEFI_TRANSFER_MODE} ${EYEFI_TRANSFERMODETIMESTAMP}\fR" The command to execute on \fBStartSession\fR request. The command receives some information via environment variables. .TP \fBon-upload-photo\fR = "\fIlogger iii-UploadPhoto ${EYEFI_MACADDRESS} ${EYEFI_UPLOADED}\fR" The command to execute after successfull photo upload. The information about the card mac address and uploaded file name is passed via environment variables. .TP \fBon-mark-last-photo-in-roll\fR = "\fIlogger iii-MarkLastPhotoInRoll ${EYEFI_MACADDRESS} ${EYEFI_MERGEDELTA}\fR" The command to execute on \fBMarkLastPhotoInRoll\fR request. The information about request is passed via environment variables. .TP \fBumask\fR = \fI002\fR The file mode creation mask. .SH AUTHOR Written by Michael Krelin <hacker@klever.net> .SH COPYRIGHT -Copyright (c) 2009 Klever Group (http://www.klever.net/) +Copyright (c) 2009-2011 Klever Group (http://www.klever.net/) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. .SH BUGS You tell me. Send reports to <iii-bugs@klever.net> |