rbphoto/trunk/debian/changelog (diff) rbphoto/trunk/lib/rbphoto/import.rb (diff)| @@ -46,6 +46,7 @@ | ||
| 46 | 46 | not to duplicate by its exif data. |
| 47 | 47 | |
| 48 | 48 | Options: |
| 49 | + -a, --all set all recommended options; same as -DmM | |
| 49 | 50 | -D, --datedir copy/move photos with datedir |
| 50 | 51 | -f, --force force to overwrite when move |
| 51 | 52 | -G, --no-gui disable GTK2+ graphical interface |
| @@ -183,6 +184,7 @@ | ||
| 183 | 184 | class Options < Hash |
| 184 | 185 | def initialize |
| 185 | 186 | parser = GetoptLong.new( |
| 187 | + ['--all', '-a', GetoptLong::NO_ARGUMENT], | |
| 186 | 188 | ['--datedir', '-D', GetoptLong::NO_ARGUMENT], |
| 187 | 189 | ['--force', '-f', GetoptLong::NO_ARGUMENT], |
| 188 | 190 | ['--no-gui', '-G', GetoptLong::NO_ARGUMENT], |
| @@ -197,7 +199,14 @@ | ||
| 197 | 199 | begin |
| 198 | 200 | parser.each do |name, arg| |
| 199 | 201 | arg = true if (arg == "") |
| 200 | - self[name.sub(/^--/, '').gsub(/-/, '_').downcase] = arg | |
| 202 | + case arg | |
| 203 | + when '--all' | |
| 204 | + self['datedir'] = true | |
| 205 | + self['move'] = true | |
| 206 | + self['with_movie'] = true | |
| 207 | + else | |
| 208 | + self[name.sub(/^--/, '').gsub(/-/, '_').downcase] = arg | |
| 209 | + end | |
| 201 | 210 | end |
| 202 | 211 | self['photographer'] ||= ENV['USER'] |
| 203 | 212 | rescue |
tach