shotwellfs 0.0.1RC0 → 0.0.1

data/.gitignore

@@ -17,3 +17,4 @@ tmp
 Gemfile.lock
 .ruby-version
 .ruby-gemset
+.idea

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'rfuse', :path => "../rfuse", :git => "https://github.com/lwoggardner/rfuse.git"
-gem 'rfusefs', :path => "../rfusefs", :git => "https://github.com/lwoggardner/rfusefs.git"
+#gem 'rfuse', :path => "../rfuse", :git => "https://github.com/lwoggardner/rfuse.git"
+#gem 'rfusefs', :path => "../rfusefs", :git => "https://github.com/lwoggardner/rfusefs.git"
 # Specify your gem's dependencies in shotwellfs.gemspec
 gemspec
- 
+

data/README.md

@@ -25,6 +25,13 @@ For more advanced usage, including controlling how events are mapped to director
 
     $ shotwellfs -h
 
+## Developers
+
+After checking out the source, run:
+
+    $ bundle install # install dependencies
+    $ bundle exec bin/shotwellfs -h
+
 ## Contributing
 
 1. Fork it

data/lib/shotwellfs.rb

@@ -15,7 +15,7 @@ module ShotwellFS
                         Available event fields - id, name, comment
                         (default "%Y-%m %<name>s")
     -o photo_path=FMT   strftime and sprintf format to generate path for photo files
-                        Available photo fields - id, title, comment, rating
+                        Available photo fields - id, filename, title, comment, rating
                         (default "%<id>d")
     -o video_path=FMT  as above for video files. If not set, photo_path is used.
 
@@ -25,9 +25,7 @@ module ShotwellFS
 
         FuseFS.main(args,OPTIONS,OPTION_USAGE,"path/to/shotwell_dir") do |options|
             if options[:device] && File.exists?("#{options[:device]}/data/photo.db")
-                fs = FileSystem.new(options)
-                Signal.trap("HUP") { fs.rescan() }
-                fs
+                FileSystem.new(options)
             else
                 puts "shotwellfs: failed to access Shotwell photo database #{options[:device]}/data/photo.db"
                 nil

data/lib/shotwellfs/filesystem.rb

@@ -25,13 +25,13 @@ module ShotwellFS
 
         SHOTWELL_SQL = <<-SQL
         SELECT P.rating as 'rating', P.exposure_time as 'exposure_time',
-               P.title as 'title', P.comment as 'comment', P.filename as 'filename', P.id as 'id',
+               P.title as 'title', P.comment as 'comment', P.filename as 'filepath', P.id as 'id',
                P.event_id as 'event_id', "photo" as 'type', P.transformations as 'transformations'
         FROM phototable P
         WHERE P.rating >= %1$d and P.event_id > 0
         UNION
         SELECT V.rating, V.exposure_time as 'exposure_time',
-               V.title, V.comment, V.filename as 'filename', V.id as 'id',
+               V.title, V.comment, V.filename as 'filepath', V.id as 'id',
                V.event_id as 'event_id', "video" as 'type', null
         FROM videotable V
         WHERE V.rating >= %1$d  and V.event_id > 0
@@ -76,9 +76,9 @@ module ShotwellFS
             example_event = { id:  1, name: "<event name>", comment: "<event comment>", exposure_time: 0} 
 
             example_photo = { id: 1000, title: "<photo title>", comment: "<photo comment>",
-                rating:5, exposure_time: Time.now.to_i, filename: "photo.jpg", type: "photo" }
+                rating:5, exposure_time: Time.now.to_i, filepath: "photo.jpg", type: "photo", filename: 'photo' }
             example_video = { id: 1000, title: "<photo title>", comment: "<photo comment>",
-                rating:5, exposure_time: Time.now.to_i, filename: "video.mp4", type: "video" }
+                rating:5, exposure_time: Time.now.to_i, filepath: "video.mp4", filename: "video", type: "video" }
 
             event_path = event_path(example_event)
 
@@ -99,8 +99,8 @@ module ShotwellFS
             @transforms_dir
         end
 
-        def transform_required?(filename,transform_id)
-            !(File.exists?(filename) && transform_id.eql?(Xattr.new(filename)[XATTR_TRANSFORM_ID]))
+        def transform_required?(filepath,transform_id)
+            !(File.exists?(filepath) && transform_id.eql?(Xattr.new(filepath)[XATTR_TRANSFORM_ID]))
         end
 
         def transform(row)
@@ -109,31 +109,33 @@ module ShotwellFS
                 transformations = Transform.new(row[:transformations])
 
                 transform_id = transformations.generate_id(row[:id])
-                filename = "#{transforms_dir}/#{row[:id]}.jpg"
+                filepath = "#{transforms_dir}/#{row[:id]}.jpg"
 
                 if transform_id 
 
-                    if transform_required?(filename,transform_id)
+                    if transform_required?(filepath,transform_id)
 
-                        puts "Generating transform for #{row[:filename]}"
-                        puts "Writing to #{filename} with id #{transform_id}"
+                        puts "Generating transform for #{row[:filepath]}"
+                        puts "Writing to #{filepath} with id #{transform_id}"
                         puts transformations
 
-                        transformations.apply(row[:filename],filename)
+                        transformations.apply(row[:filepath],filepath)
 
-                        xattr = Xattr.new(filename)
+                        xattr = Xattr.new(filepath)
                         xattr[XATTR_TRANSFORM_ID] = transform_id
                     end
 
-                    return [ transform_id, filename ]
+                    return [ transform_id, filepath ]
                 end
             end
             # Ho transforms
-            [ row[:id],row[:filename] ]
+            [ row[:id],row[:filepath] ]
         end
 
         def map_row(row)
             row = symbolize(row)
+            row[:filename] = File.basename(row[:filepath],'.*')
+
             xattr = file_xattr(row)
 
             transform_id, real_file = transform(row)
@@ -159,6 +161,7 @@ module ShotwellFS
 
             puts "Scan ##{scan_id} Finding images and photos for #{@events.size} events"
             super
+            puts "Scan ##{scan_id} complete"
             @keywords= nil
             @events = nil
         end
@@ -189,6 +192,9 @@ module ShotwellFS
             super
         end
 
+        def sighup()
+            rescan
+        end
 
         private 
 
@@ -209,13 +215,13 @@ module ShotwellFS
         end
 
         def file_path(event_path,image)
-            ext = File.extname(image[:filename]).downcase
+            ext = File.extname(image[:filepath]).downcase
 
             format = image['type'] == 'photo' ? @photo_path : @video_path
 
-            filename = sprintf(Time.at(image[:exposure_time]).strftime(format),image)
+            filepath = sprintf(Time.at(image[:exposure_time]).strftime(format),image)
 
-            return "#{event_path}/#{filename}#{ext}"
+            return "#{event_path}/#{filepath}#{ext}"
         end
 
         def file_xattr(image)

data/lib/shotwellfs/version.rb

@@ -1,3 +1,3 @@
 module ShotwellFS
-  VERSION = "0.0.1RC0"
+  VERSION = "0.0.1"
 end

data/shotwellfs.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_runtime_dependency("sqlite3","~>1.3")
-  gem.add_runtime_dependency("rfusefs",">=1.0.2")
+  gem.add_runtime_dependency("rfusefs",">=1.0.3")
   gem.add_runtime_dependency("rb-inotify","~>0.9")
   gem.add_runtime_dependency("rmagick","~>2.13")
   gem.add_runtime_dependency("iniparse","~>1.1")

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: shotwellfs
 version: !ruby/object:Gem::Version
-  version: 0.0.1RC0
-  prerelease: 5
+  version: 0.0.1
+  prerelease: 
 platform: ruby
 authors:
 - Grant Gardner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2015-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
@@ -189,9 +189,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25