Added support for iPhoto/Aperture

Author: r0x0r

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.2
+- `New` Support for importing directly from iPhoto / Aperture libraries
+
 ## 1.0
 - `Improved` Better command line parameters parsing
 - `Improved` Changed file names. The launch file is now lycheeupload.py

README.md

@@ -1,11 +1,11 @@
 # Lychee Upload
-A command line tool for uploading photos on a hard drive to a [Lychee](http://github.com/electerious/Lychee) installation on a remote server via SSH.
-Based on [lycheesync](https://github.com/GustavePate/lycheesync) by Gustave Paté
+A command line tool for uploading photos in a directory or from iPhoto/Aperture libraries to a [Lychee](http://github.com/electerious/Lychee) installation on a remote server via SSH.
+Based on [lycheesync](https://github.com/GustavePate/lycheesync) by Gustave Paté and [Phoshare](https://code.google.com/p/phoshare/) by Google. 
 
 
 # Description
 
-Performs a batch image import from a location on hard drive to the Lychee installation on a remote server via SSH. Subdirectories are automatically converted to Lychee albums. As Lychee does not support sub-albums, photos in subsubdirectories are uploaded to the respective album. Photos in the root directory are uploaded to the Unsorted album.
+Performs a batch image import from a location on hard drive or from an iPhoto/Aperture library to the Lychee installation on a remote server via SSH. When importing from a directory, subdirectories are automatically converted to Lychee albums. As Lychee does not support sub-albums, photos in subsubdirectories are uploaded to the respective album. Photos in the root directory are uploaded to the Unsorted album. In the iPhoto/Aperture mode you can specify what to export. Possible options are events, albums and smart albums.
 If you want to replace albums in the Lychee database, then you can use *-r* option. All photos in the existing album will be deleted in the Lychee database and replaced with new ones from the hard drive location.
 
 # Installation
@@ -42,21 +42,50 @@ Finally install dependencies using *pip*
 
 # Usage
 
-`python lycheeupload.py [-h] [-d DIR] [-r] [-p] [-v] username@hostname:path 
+`python lycheeupload.py [-h] [-d DIR] [-r] [-p] [-v] username@hostname:path`
+
+General options
 
 - `username@hostname:path` Server connection string with a full path to the directory where Lychee is installed. 
 -  `-h`, `--help`            show a help message
--  `-d DIR`, `--dir DIR`     path to the photo directory where to export photos from.
 -  `-r`, `--replace`         replace albums in Lychee with local ones
 -  `-p`, `--public`          make uploaded photos public
 -  `-v`, `--verbose`         print verbose messages
 
+Directory import  options
+
+-  `-d DIR`, `--dir DIR`     path to the photo directory where to export photos from.
+
+iPhoto / Aperture options
+
+-  `--iphoto [path]`         Import from iPhoto. If path is not provided, then default location is used.
+-  `--aperture [path]`       Import from Aperture. If path is not provided, then default location is used.
+-  `-e [pattern]`, `--events [pattern]` Export matching events. The argument is a regular expression. If the argument is omitted, then all events are exported.
+-  `-a [pattern]`, `--albums [pattern]` Export matching regular albums. The argument is a regular expression. If the argument is omitted, then all events are exported.
+-  `-s [pattern]`, `--smarts [pattern]` Export matching smart albums. The argument is a regular expression. If the argument is omitted, then all events are exported.
+- `--originals`           Export originals instead of modified images
+-  `-x pattern`, `--exclude pattern` Don't export matching albums or events. The pattern is a regular expression.
+
+At very least you must specify a connection string and a source where photos should be imported from (`--dir`, `--iphoto` or `--aperture` options). 
+
 For example to import photos from the directory */home/user/photos/* to the remote server *example.com* with Lychee installed in the */home/user/mydomain.com/* directory, issue the following command
 
 `python lycheeupload.py -d /home/user/photos/ user@example.com:/home/user/mydomain.com/`
 
+Import all events from the default iPhoto library location (~/Pictures/iPhoto Library)
+
+`python lycheeupload.py --iphoto --events user@example.com:/home/user/mydomain.com/`
+
+Import all the albums starting with the word "Summer" from the Aperture library located in *~/Pictures/My Aperture Library*
+
+`python lycheeupload.py --aperture "~/Pictures/My Aperture Library" --albums "Summer.*" user@example.com:/home/user/mydomain.com/`
+
+
+
 
 
 # Licence
 
 [MIT License](./LICENSE)
+
+Parts of the program are licensed under the Apache License 2.0

conf.py

@@ -5,16 +5,12 @@
 
 
 class Conf:
+    IPHOTO_DEFAULT_PATH = "~/Pictures/iPhoto Library/"
+    APERTURE_DEFAULT_PATH = "~/Pictures/Aperture Library.aplibrary/"
     pass
 
 conf = Conf()
 conf.verbose = logging.ERROR
 
 
-def load_conf(conf_file):
-    loaded_conf = json.load(open(conf_file, 'r'))
-
-    for key, value in loaded_conf.items():
-        setattr(conf, key, value)
-
 

database.py

@@ -104,7 +104,7 @@ def loadAlbumList(self):
         return self.albumslist
 
 
-    def albumExists(self, album):
+    def albumExists(self, album_name):
         """
         Check against its name if an album exists
         Parameters:
@@ -113,8 +113,8 @@ def albumExists(self, album):
         :return: album id or None if the album does not exist
         """
 
-        if album['name'] and album['name'] in self.albumslist.keys():
-            return self.albumslist[album['name']]
+        if album_name and album_name in self.albumslist.keys():
+            return self.albumslist[album_name]
         else:
             return None
 
@@ -143,63 +143,65 @@ def photoExists(self, photo):
         finally:
             return res
 
-    def createAlbum(self, album):
+
+    def createAlbum(self, album_name):
         """
         Creates an album
         Parameter:
         - album: the album properties list, at least the name should be specified
         Returns the created albumid or None
         """
-        album['id'] = None
+        id = None
         query = "INSERT INTO lychee_albums (title, sysstamp, public, password) " \
-                "VALUES ('{}', '{}', '{}', NULL)".format(album['name'],
+                "VALUES ('{}', '{}', '{}', NULL)".format(album_name,
                                                          datetime.datetime.now().strftime('%s'),
                                                          conf.public)
         try:
             cur = self.db.cursor()
             cur.execute(query)
             self.db.commit()
 
-            query = "select id from lychee_albums where title='" + album['name'] + "'"
+            query = "select id from lychee_albums where title='" + album_name + "'"
             cur.execute(query)
             row = cur.fetchone()
             self.albumslist['name'] = row[0]
-            album['id'] = row[0]
+            id = row[0]
 
-            logger.info("Album {} created".format(album["name"]))
+            logger.info("Album {} created".format(album_name))
 
         except Exception:
-            logger.error('Failed to create album #{} {}'.format(album["id"], album["name"]), exc_info=True)
-            album['id'] = None
+            logger.error('Failed to create album #{} {}'.format(id, album_name), exc_info=True)
+            id = None
         finally:
-            return album['id']
+            return id
 
 
-    def eraseAlbum(self, album):
+    def eraseAlbum(self, id):
         """
         Deletes all photos of an album but don't delete the album itself
         Parameters:
         - album: the album properties list to erase.  At least its id must be provided
         Return list of the erased photo url
         """
-        res = []
-        query = "delete from lychee_photos where album = " + str(album['id']) + ''
-        selquery = "select url from lychee_photos where album = " + str(album['id']) + ''
+        query = "delete from lychee_photos where album = " + id + ''
+        selquery = "select url from lychee_photos where album = " + id + ''
+
+        file_list = []
         try:
             cur = self.db.cursor()
             cur.execute(selquery)
             rows = cur.fetchall()
             for row in rows:
-                res.append(row[0])
+                file_list.append(row[0])
             cur.execute(query)
             self.db.commit()
+            logger.info("Album #{} deleted.".format(id))
 
-            logger.info("Album {} deleted.".format(album["name"]))
+            return file_list
         except Exception:
-            logger.error('Failed to delete album #{} {}'.format(album["id"], album["name"]), exc_info=True)
+            logger.error('Failed to delete album #{}'.format(id), exc_info=True)
 
-        finally:
-            return res
+            return None
 
 
 
@@ -235,7 +237,7 @@ def addFileToAlbum(self, photo):
 
             return True
         except Exception as e:
-            logger.error("Inserting photo {} into database failed".format(photo.id))
+            logger.error("Inserting photo {} into database failed".format(photo.id), exc_info=True)
 
             return False