enigmamachine 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/enigmamachine.rb

@@ -56,6 +56,7 @@ class EnigmaMachine < Sinatra::Base
   # main Sinatra/thin thread once the periodic timer is added.
   #
   configure do
+    Video.reset_encoding_videos
     Thread.new do
       until EM.reactor_running?
         sleep 1
@@ -222,17 +223,5 @@ class EnigmaMachine < Sinatra::Base
     end
   end
 
-
-  # If any videos are marked as "encoding" when the application starts,
-  # presumably due to an encoding interruption in the last session, they
-  # should be reset.
-  #
-  def reset_encoding_videos
-    Video.encoding.each do |video|
-      video.state = "unencoded"
-      video.save!
-    end
-  end
-
 end
 

data/lib/enigmamachine/encoding_queue.rb

@@ -9,7 +9,6 @@ class EncodingQueue
     EM.add_periodic_timer(5) {
       encode_next_video
     }
-    encode_next_video
   end
 
 
@@ -21,9 +20,7 @@ class EncodingQueue
       begin
         video.encoder.encode(video)
       rescue Exception => ex
-        File.open('/home/dave/test.txt', 'w') do |f|
-          f.puts ex
-        end
+        # don't do anything just yet, until we set up logging properly.
       end
     end
   end

data/lib/enigmamachine/models/video.rb

@@ -33,5 +33,19 @@ class Video
     all(:state => 'complete', :order => [:updated_at.desc])
   end
 
+  # Resets all videos currently marked as "encoding" to state "unencoded"
+  # which is the initial state.
+  #
+  # If any videos are marked as "encoding" when the application starts,
+  # presumably due to an encoding interruption in the last session, they
+  # should be reset.
+  #
+  def self.reset_encoding_videos
+    Video.encoding.each do |video|
+      video.state = "unencoded"
+      video.save!
+    end
+  end
+
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: enigmamachine
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - dave