flickrup 1.1.16 → 1.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad462e038fa89dfb979d9af1c698b9f87580b71a
-  data.tar.gz: 54d8cebb44f503918fd6e4c6b85bbacbb57ffd88
+  metadata.gz: ece798f51989ffaa6c056bc48e54d9a593ba7248
+  data.tar.gz: 7ef6b9643cf597917b614353b4934e9d05ea1d9c
 SHA512:
-  metadata.gz: 0f52e164534c066fee0275f7fcb3b5fc4a4cfb66141c079cf03f76d79ce8aab383df89f381c16d3feeb95598f11bac62fdf0adb6c801b1b6f216b008f9aa4f3c
-  data.tar.gz: 51594d054c856ae00d68c8dc82387fc5fcfcc4353724fca6e32a48384c26a9f385e08c86b6415de90061033f75644e4e8b104bbc91e999583992ca196bf406f4
+  metadata.gz: d270ceea438c105e8d28626e61c1c1ee2dac02d05169962809fade8cb1e0e8eeee52c7a64ed8352fb27a702b9189a7f3af06822edd597e697733f4f220cc9683
+  data.tar.gz: 540b8c03c5d9a1161ae7347be209fa7bfeb8cb51cdf08e1f0f9649251558a73e9bd11f47767110be12619814a32cd97382e4ba87e7125cebcd9be159c372e142

data/lib/flickrup/converter.rb

@@ -0,0 +1,33 @@
+require 'fileutils'
+require 'tmpdir'
+
+class Converter
+  include Logging
+
+  def initialize(mappings)
+    @mappings = mappings
+    @move_dir = Dir.tmpdir
+  end
+
+  def maybe_convert(file)
+    mapping = @mappings[File.extname(file)[1..-1].downcase]
+
+    if mapping then
+      to_exec = mapping % {:file => file}
+      logger.debug("Running: #{to_exec}")
+      result = system(to_exec)
+
+      if result
+        logger.info("Removing converted source file #{file}")
+        logger.debug("Moving #{file} to #{@move_dir}")
+        FileUtils.mv(file, @move_dir)
+      else
+        logger.info("Failed to convert source file #{file}")
+      end
+
+      return result
+    else
+      false
+    end
+  end
+end

data/lib/flickrup/filetype/tagged_video.rb

@@ -28,6 +28,6 @@ class TaggedVideo < TaggedFile
     TYPE
   end
 
-  register_reader(%w(mp4 MP4 mts MTS))
+  register_reader(%w(mp4 MP4))
 
 end

data/lib/flickrup/processor.rb

@@ -8,6 +8,7 @@ require "flickrup/ext/visibility"
 require "flickrup/ext/sidecar"
 require "flickrup/archiver"
 require "flickrup/ext/associated_files"
+require 'flickrup/converter'
 
 class Processor
   include Logging
@@ -15,6 +16,7 @@ class Processor
   def initialize(config)
     @MAX_DATE = Time.at(2130578470)
     @config = config
+    @converter = Converter.new(config[:convert_files])
   end
 
   def paused
@@ -30,6 +32,19 @@ class Processor
       return 0
     end
 
+    converted_count = all_files.select{ |x|
+      if File.exist? x
+        @converter.maybe_convert(x)
+      else
+        false
+      end
+    }.length
+
+    if converted_count > 0
+      logger.info("Converted #{converted_count} files, reprocessing")
+      return true
+    end
+
     # some files may have been removed by now: https://bitbucket.org/jgilbert/flickrup/issue/1
     files = all_files.map { |x|
       if File.exist? x
@@ -81,7 +96,7 @@ class Processor
 
     logger.info("Processed #{tagged.length} valid files")
 
-    tagged.length
+    false
   end
 
   private

data/lib/flickrup/slow_listener.rb

@@ -53,7 +53,7 @@ class SlowListener
         #ignore, processing thread will reschedule
         logger.info("Scheduling queued")
       when IDLE
-        schedule_internal
+        schedule_internal @wait
     end
   end
 
@@ -71,6 +71,7 @@ class SlowListener
     @processing.set PROCESSING
 
     files = Dir["#{@config[:watch_dir]}/*.*"]
+    reprocess = false
 
     old, new = files.partition { |x| Time.now > File.mtime(x) + @wait }
 
@@ -81,25 +82,27 @@ class SlowListener
 
     unless old.empty?
       logger.info("Found #{old.length} stable files")
-      @processor.run(old)
+      reprocess = @processor.run(old)
     end
 
     @processing.compare_and_swap(PROCESSING, IDLE)
 
-    if @processing.get == SCHEDULED
+    if reprocess
+      schedule_internal 1
+    elsif @processing.get == SCHEDULED
       logger.info("Rescheduling...")
-      schedule_internal
+      schedule_internal @wait
     end
   end
 
-  def schedule_internal
+  def schedule_internal(secs)
     if @scheduler.jobs.empty?
-      logger.info("Scheduling processing for #@wait sec")
-      @scheduler.in @wait do
+      logger.info("Scheduling processing for #{secs} sec")
+      @scheduler.in secs do
         do_upload
       end
     else
-      logger.info("Already scheduled")
+      logger.info('Already scheduled')
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickrup
 version: !ruby/object:Gem::Version
-  version: 1.1.16
+  version: 1.1.17
 platform: ruby
 authors:
 - Jonathan Gilbert
@@ -130,6 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/flickrup/archiver.rb
+- lib/flickrup/converter.rb
 - lib/flickrup/ext/associated_files.rb
 - lib/flickrup/ext/machine_tags.rb
 - lib/flickrup/ext/prefixed_extension.rb