| 
						
					 | 
					
						
						
							
						
						ec0828e610
					 | 
					
						
						
							
							Merge updates from 'master'
						
						
						
						
						
						
					 | 
					
						2015-06-06 06:55:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						37b63f2a4a
					 | 
					
						
						
							
							Kill pool if interrupted/error.
						
						
						
						
						
						
					 | 
					
						2015-06-06 06:45:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a169bafdd8
					 | 
					
						
						
							
							Fix args passed to videotool. Fixed video.
						
						
						
						
						
						
						
						Encodes at 4Mbps with multiple cores. 
						
						
					 | 
					
						2015-06-02 23:13:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3bdcd1cc66
					 | 
					
						
						
							
							Handle TypeError. exif{}-date is already datetime.
						
						
						
						
						
						
					 | 
					
						2015-06-02 20:28:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f5696cb075
					 | 
					
						
						
							
							Allow masking directories by twiddling permissions.
						
						
						
						
						
						
					 | 
					
						2015-05-26 14:55:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1b2cde7661
					 | 
					
						
						
							
							Correct order of arguments.
						
						
						
						
						
						
					 | 
					
						2015-05-05 00:39:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						50ab2143ec
					 | 
					
						
						
							
							Heh :-D
						
						
						
						
						
						
					 | 
					
						2015-05-05 00:12:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ff7e540eb8
					 | 
					
						
						
							
							Thumbnail-method for both photo and video.
						
						
						
						
						
						
					 | 
					
						2015-05-05 00:08:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						80bb5258d6
					 | 
					
						
						
							
							If tool fails, it would not continue.
						
						
						
						
						
						
					 | 
					
						2015-05-04 23:57:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ac52f76025
					 | 
					
						
						
							
							First attempt at merging video-patch.
						
						
						
						
						
						
					 | 
					
						2015-05-04 19:46:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6e4fe49d50
					 | 
					
						
						
							
							Updated master, merging into patches.
						
						
						
						
						
						
					 | 
					
						2015-05-04 17:45:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						54c68be7fd
					 | 
					
						
						
							
							Don't crash when unable to unlink
						
						
						
						
						
						
					 | 
					
						2015-01-27 15:18:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						148b88951d
					 | 
					
						
						
							
							Don't deal with invalid unicode
						
						
						
						
						
						
					 | 
					
						2015-01-27 14:39:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						61aabc7ee2
					 | 
					
						
						
							
							Copy and paste error
						
						
						
						
						
						
					 | 
					
						2015-01-25 14:21:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7d2528280b
					 | 
					
						
						
							
							Python unicode is awful
						
						
						
						
						
						
					 | 
					
						2015-01-19 13:08:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2b8918dd7c
					 | 
					
						
						
							
							Return proper date type.
						
						
						
						
						
						
					 | 
					
						2014-08-25 22:37:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d5c9f54b34
					 | 
					
						
						
							
							Convert Exif dateTime[Original] attributes to datetime type to fix comparison with dateTimeFile
						
						
						
						
						
						
					 | 
					
						2014-08-15 20:46:23 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a7192297df
					 | 
					
						
						
							
							Indents (-:
						
						
						
						
						
						
					 | 
					
						2014-03-16 15:19:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dee0ab294f
					 | 
					
						
						
							
							Use threading to make thumbs in parallel.
						
						
						
						
						
						
						
						Known bug: interrupt makes it go crazy. 
						
						
					 | 
					
						2014-03-16 15:17:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c9ce27eb87
					 | 
					
						
						
							
							Add 1600px size. Remove unused 800px size.
						
						
						
						
						
						
					 | 
					
						2014-03-16 15:03:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ba69da0fde
					 | 
					
						
						
							
							Send admin password, not admin username.
						
						
						
						
						
						
					 | 
					
						2014-03-14 11:32:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d33715066a
					 | 
					
						
						
							
							Restructuring
						
						
						
						
						
						
						
						Import flask app as well as new makefile and entirely new directory
structure. 
						
						
					 | 
					
						2014-03-12 17:28:59 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						52667388e9
					 | 
					
						
						
							
							Fix caching of top-level items
						
						
						
						
						
						
					 | 
					
						2014-02-13 23:28:59 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						213fd2ffc7
					 | 
					
						
						
							
							Support libav for video processing
						
						
						
						
						
						
					 | 
					
						2014-01-29 18:11:25 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1bb130d37b
					 | 
					
						
						
							
							Fix testing for duration in video metadata
						
						
						
						
						
						
					 | 
					
						2013-12-22 21:40:48 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2df2730cd3
					 | 
					
						
						
							
							Read metadata from previously transcoded video (must account for rotation and/or downscaling)
						
						
						
						
						
						
					 | 
					
						2013-12-22 21:09:05 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0d35832b21
					 | 
					
						
						
							
							Handle video metadata correctly
						
						
						
						
						
						
					 | 
					
						2013-12-22 20:33:43 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0443b99492
					 | 
					
						
						
							
							If thumbing or transcoding fails, invalidate entry.
						
						
						
						
						
						
					 | 
					
						2013-12-21 20:46:56 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6f482f8f78
					 | 
					
						
						
							
							Add support for videos using ffmpeg for transcoding to webm format and HTML5 video tag.
						
						
						
						
						
						
					 | 
					
						2013-12-21 00:42:23 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0cf87e26de
					 | 
					
						
						
							
							Force system encoding to be UTF-8.
						
						
						
						
						
						
					 | 
					
						2012-08-22 17:10:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ba72d7c8b7
					 | 
					
						
						
							
							Make sure to use right encoding for initial UTF-8 path.
						
						
						
						
						
						
					 | 
					
						2012-06-22 17:54:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						120b8846b7
					 | 
					
						
						
							
							Higher quality thumbs.
						
						
						
						
						
						
					 | 
					
						2012-04-22 19:20:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						836503156d
					 | 
					
						
						
							
							Sometimes exif strings are null terminated, and python imagining library doesn't deal with that for us.
						
						
						
						
						
						
					 | 
					
						2012-03-29 15:42:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						725cb85cdb
					 | 
					
						
						
							
							Add more exif types, thanks to the imageinfo javascript plugin in some random google chrome demo extension.
						
						
						
						
						
						
					 | 
					
						2011-06-27 17:12:59 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4609fb54e8
					 | 
					
						
						
							
							Better output on scanner.
						
						
						
						
						
						
					 | 
					
						2011-05-23 05:25:45 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						271afa6611
					 | 
					
						
						
							
							Rescan corrupted albums.
						
						
						
						
						
						
					 | 
					
						2011-05-13 04:06:36 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						567f38e88b
					 | 
					
						
						
							
							Fix unicode error for Espen.
						
						
						
						
						
						
					 | 
					
						2011-05-12 21:38:14 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fb01d666b8
					 | 
					
						
						
							
							Guard the string lookups better.
						
						
						
						
						
						
					 | 
					
						2011-05-09 18:08:07 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ddba74b57c
					 | 
					
						
						
							
							Skip dot files. Fix key error.
						
						
						
						
						
						
					 | 
					
						2011-05-09 17:49:09 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6d75a3ed64
					 | 
					
						
						
							
							To work around Espen's corrupted image bug, we simply try to copy the image twice. The second time will usually work, unless the file is totally borked.
						
						
						
						
						
						
					 | 
					
						2011-05-09 09:33:30 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						68a1f42e34
					 | 
					
						
						
							
							Final tweeks.
						
						
						
						
						
						
					 | 
					
						2011-05-07 07:42:34 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e3e8e3297d
					 | 
					
						
						
							
							Meta data consolidation.
						
						
						
						
						
						
					 | 
					
						2011-05-07 03:42:44 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e87fe0a96c
					 | 
					
						
						
							
							Fix dem bugs.
						
						
						
						
						
						
					 | 
					
						2011-05-07 03:12:20 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						47a1e12c2c
					 | 
					
						
						
							
							More case bugs.
						
						
						
						
						
						
					 | 
					
						2011-05-07 03:05:54 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d51f298102
					 | 
					
						
						
							
							Date time bug.
						
						
						
						
						
						
					 | 
					
						2011-05-07 03:00:06 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						07369da4aa
					 | 
					
						
						
							
							Proper metadata support.
						
						
						
						
						
						
					 | 
					
						2011-05-07 02:56:54 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8bd9d1519e
					 | 
					
						
						
							
							LIl things.
						
						
						
						
						
						
					 | 
					
						2011-05-06 22:48:09 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2e017d0df3
					 | 
					
						
						
							
							Polishing...
						
						
						
						
						
						
					 | 
					
						2011-05-06 21:12:51 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						039f009a15
					 | 
					
						
						
							
							Change hash tag. Thumbs on albums.
						
						
						
						
						
						
					 | 
					
						2011-05-06 18:55:02 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b16b6eee02
					 | 
					
						
						
							
							Better centering. Fix album sorted bug.
						
						
						
						
						
						
					 | 
					
						2011-05-06 08:38:15 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |