rubyVDRconvert 0.0.7 → 0.0.9

data/lib/file_dir.rb

@@ -2,35 +2,34 @@ require 'find'
 
 class FileDir
   def self.delete!(filedir)
-	begin
-	  p filedir
-	  case Dir.exist?(filedir)
-		when true
-		  begin
-			Dir.rmdir(filedir)
-		  rescue
-			Dir.foreach(filedir) { | entry |
-			  delete!(filedir + '/' + entry) unless (entry == ".") or (entry == "..")
-			}
-			retry
-		  end
-		else
-		  File.delete(filedir)
-	  end
-	rescue
-	  $stderr.puts "Failed to delete #{filedir}"
-	end
+    begin
+      case Dir.exist?(filedir)
+        when true
+          begin
+            Dir.rmdir(filedir)
+          rescue
+            Dir.foreach(filedir) { | entry |
+              delete!(filedir + '/' + entry) unless (entry == ".") or (entry == "..")
+            }
+            retry
+          end
+        else
+          File.delete(filedir)
+      end
+    rescue
+      $stderr.puts "Failed to delete #{filedir}"
+    end
   end
   def self.mkdirtree(directory)
-	begin
-	  Dir.mkdir(directory)
-	rescue SystemCallError => ex
-	  parent = File.dirname(directory)
-	  # Prevent an endless loop
-	  return true if Dir.exist?(directory)
-	  raise ex if parent.length == '/'
-	  self.mkdirtree(parent)
-	  retry
-	end
+    begin
+      Dir.mkdir(directory)
+    rescue SystemCallError => ex
+      parent = File.dirname(directory)
+      # Prevent an endless loop
+      return true if Dir.exist?(directory)
+      raise ex if parent.length == '/'
+      self.mkdirtree(parent)
+      retry
+    end
   end
 end

data/lib/recording.rb

@@ -19,7 +19,7 @@ class Recording
     @timestamp = File.mtime(@directory + '/index')
     load_info
     determine_stream_type
-    p "New recording: #{@friendly_name}"
+    puts "New recording: #{@friendly_name}"
   end
   def marshal_dump()
     [ @directory, @recording, @title, @subtitle, @friendly_name, @target_dir, @processed, @timestamp, @recording_time ]
@@ -37,10 +37,9 @@ class Recording
   end
   def delete!()
     @mutex.synchronize {
+      @recording.delete! if @recording
       @recording = nil
       GC.start
-      p "Deleting....", self, @target_dir
-      FileDir.delete!(@target_dir)
     }
   end
   def load_info()
@@ -53,10 +52,8 @@ class Recording
       case line[0..1]
         when 'T '
           @title = line[2..256].chomp
-          p "Found title: #{@title}"
         when 'S '
           @subtitle = line[2..256].chomp
-          p "Found subtitle: #{@subtitle}"
         when 'E '
           @recording_time = Time.at(line.split[2].to_i)
       end
@@ -81,7 +78,7 @@ class Recording
     end
   end
   def process!()
-    p "Starting processing of #{@friendly_name}"
+    puts "Processing of #{@friendly_name} started..."
     @mutex.synchronize{
       @processed = true if @recording.process!
     }

data/lib/recording_ts.rb

@@ -2,21 +2,29 @@ require 'file_dir'
 
 class RecordingTS
   def initialize(recording)
-	@parent = recording
+    @parent = recording
+    @target_file = nil
   end
   def process!()
-	target_file = @parent.target_dir + "/#{@parent.friendly_name}.ts"
-	FileDir.mkdirtree(@parent.target_dir)
-	tf = File.new(target_file, 'wb:ascii-8bit')
-	source_files = Dir.glob("#{@parent.directory}/*.ts")
-	source_files.sort!
-	source_files.each { | source_file |
-	  sf = File.new(source_file, 'rb:ascii-8bit')
-	  while not sf.eof?
-		tf.write(sf.read(1*(2**20))) # Only read some bytes at once
-		sleep(0.01) # Be friendly to other processes
-	  end
-	  sf.close
-	}
+    @target_file = @parent.target_dir + "/#{@parent.friendly_name}.ts"
+    FileDir.mkdirtree(@parent.target_dir)
+    tf = File.new(@target_file, 'wb:ascii-8bit')
+    source_files = Dir.glob("#{@parent.directory}/*.ts")
+    source_files.sort!
+    source_files.each { | source_file |
+      sf = File.new(source_file, 'rb:ascii-8bit')
+      while not sf.eof?
+        tf.write(sf.read(1*(2**20))) # Only read some bytes at once
+        sleep(0.01) # Be friendly to other processes
+      end
+      sf.close
+    }
+  end
+  def delete!()
+    begin
+      puts "Removing file #{@target_file}"
+      File.delete(@target_file) if @target_file
+    rescue
+    end
   end
 end

data/lib/recording_vdr.rb

@@ -1,21 +1,28 @@
 class RecordingVDR
   def initialize(recording)
-	@parent = recording
+    @parent = recording
+    @target_file = nil
   end
   def process!()
-	return false
-	target_file = @parent.target_dir + "/#{@parent.friendly_name}.ts"
-	FileDir.mkdirtree(@parent.target_dir)
-	tf = File.new(target_file, 'wb:ascii-8bit')
-	source_files = Dir.glob("#{@parent.directory}/*.ts")
-	source_files.sort!
-	source_files.each { | source_file |
-	  sf = File.new(source_file, 'rb:ascii-8bit')
-	  while not sf.eof?
-		tf.write(sf.read(1*(2**20))) # Only read some bytes at once
-		sleep(0.01) # Be friendly to other processes
-	  end
-	  sf.close
-	}
+    return false
+    @target_file = @parent.target_dir + "/#{@parent.friendly_name}.ts"
+    FileDir.mkdirtree(@parent.target_dir)
+    tf = File.new(@target_file, 'wb:ascii-8bit')
+    source_files = Dir.glob("#{@parent.directory}/*.ts")
+    source_files.sort!
+    source_files.each { | source_file |
+      sf = File.new(source_file, 'rb:ascii-8bit')
+      while not sf.eof?
+        tf.write(sf.read(1*(2**20))) # Only read some bytes at once
+        sleep(0.01) # Be friendly to other processes
+      end
+      sf.close
+    }
+  end
+  def delete!()
+    begin
+      File.delete(@target_file) if @target_file
+    rescue
+    end
   end
 end

data/lib/recordings.rb

@@ -19,14 +19,13 @@ class Recordings
           found_directories << directory
           if @recordings_db[directory] == nil then
             # Found a new entry
-            p directory
-            p add(directory)
+            add(directory)
           end
         end
       end
     }
     @recordings_db.each { | recording |
-      p recording.class, recording
+      puts "Removing recording: #{recording}"
       recording[1].delete! unless found_directories.include?(recording[1].directory)
     }
   end
@@ -47,11 +46,8 @@ class Recordings
     # TODO: Add a new recording that was found in the specified directory
     # Ensure that VDR has finished writing the recording by checking the mtime of the index file
     # Wait at least 30 seconds after VDR has finished
-    p Time.now - File.mtime(directory + '/index')
     return false unless (Time.now - File.mtime(directory + '/index')) > 30
-    p "Old enough... continuing."
     @recordings_db[directory] = Recording.new(directory)
     @recordings_db[directory].process!
-    p @recordings_db[directory]
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Daniel Frank