rubyVDRconvert 0.0.6 → 0.0.7

data/lib/recording.rb

@@ -7,79 +7,83 @@ require 'file_dir'
 class Recording
   attr_reader :directory, :target_dir, :processed, :friendly_name
   def initialize(directory)
-	@mutex = Mutex.new
-	@directory = directory
-	@recording = nil
-	@title = nil
-	@subtitle = nil
-	@friendly_name = nil
-	@recording_time = nil
-	@target_dir = nil
-	@processed = false
-	@timestamp = File.mtime(@directory + '/index')
-	load_info
-	determine_stream_type
-	p "New recording: #{@friendly_name}"
+    @mutex = Mutex.new
+    @directory = directory
+    @recording = nil
+    @title = nil
+    @subtitle = nil
+    @friendly_name = nil
+    @recording_time = nil
+    @target_dir = nil
+    @processed = false
+    @timestamp = File.mtime(@directory + '/index')
+    load_info
+    determine_stream_type
+    p "New recording: #{@friendly_name}"
   end
   def marshal_dump()
-	[ @directory, @recording, @title, @subtitle, @friendly_name, @target_dir, @processed, @timestamp, @recording_time ]
+    [ @directory, @recording, @title, @subtitle, @friendly_name, @target_dir, @processed, @timestamp, @recording_time ]
   end
   def marshal_load(variables)
-	@mutex = Mutex.new
-	@directory = variables[0]
-	@recording = variables[1]
-	@friendly_name = variables[4]
-	@target_dir = variables[5]
-	@processed = variables[6]
-	@timestamp = variables[7]
-	load_info
+    @mutex = Mutex.new
+    @directory = variables[0]
+    @recording = variables[1]
+    @friendly_name = variables[4]
+    @target_dir = variables[5]
+    @processed = variables[6]
+    @timestamp = variables[7]
+    load_info
 
   end
   def delete!()
-	@mutex.synchronize {
-	  @recording = nil
-	  GC.start
-	  p "Deleting....", self, @target_dir
-	  FileDir.delete!(@target_dir)
-	}
+    @mutex.synchronize {
+      @recording = nil
+      GC.start
+      p "Deleting....", self, @target_dir
+      FileDir.delete!(@target_dir)
+    }
   end
   def load_info()
-	info = File.read(@directory + '/info')
-	info.each_line { | line |
-	  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
-	}
-	@title = 'Unknown' if not @title
-	@subtitle = 'Unknown' if not @subtitle
-	title = @title
-	subtitle = @subtitle
-	title.gsub!('/', '!')
-	subtitle.gsub!('/', '!')
-	@target_dir = "/video/#{title}/#{subtitle}"
-	@friendly_name = "#{@recording_time.strftime("%y%m%d-%H%M")} - #{title}"
+    begin
+      info = File.read(@directory + '/info')
+    rescue
+      return
+    end
+    info.each_line { | line |
+      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
+    }
+    @title = 'Unknown' if not @title
+    @subtitle = 'Unknown' if not @subtitle
+    title = @title
+    subtitle = @subtitle
+    title.gsub!('/', '!')
+    subtitle.gsub!('/', '!')
+    @target_dir = "/video/#{title}/#{subtitle}"
+    @friendly_name = "#{@recording_time.strftime("%y%m%d-%H%M")} - #{title}"
   end
   def determine_stream_type()
-	case
-	  when File.file?(@directory + '/00001.ts')
-		@recording = RecordingTS.new(self)
-	  when File.file?(@directory + '/00001.vdr')
-		@recording = RecordingVDR.new(self)
-	  else
-		raise 'Unknown recording'
-	end
+    case
+      when File.file?(@directory + '/00001.ts')
+        @recording = RecordingTS.new(self)
+      when File.file?(@directory + '/00001.vdr')
+        @recording = RecordingVDR.new(self)
+      else
+        raise 'Unknown recording'
+    end
   end
   def process!()
-	p "Starting processing of #{@friendly_name}"
-	@mutex.synchronize{
-	  @processed = true if @recording.process!
-	}
+    p "Starting processing of #{@friendly_name}"
+    @mutex.synchronize{
+      @processed = true if @recording.process!
+    }
   end
 end

data/lib/recordings.rb

@@ -5,51 +5,53 @@ require 'recording'
 
 class Recordings
   def initialize()
-	@recordings_db = Hash.new
+    @recordings_db = Hash.new
   end
   def scan()
-	basedir = '/vdr'
-	found_directories = Array.new
-	Find.find(basedir) { | entry |
-	  entry.force_encoding('BINARY')
-	  # Look for the index file created by VDR
-	  if File.basename(entry) == "index" then
-		directory = File.dirname(entry)
-		found_directories << directory
-		if @recordings_db[directory] == nil then
-		  # Found a new entry
-		  p directory
-		  p add(directory)
-		end
-	  end
-	}
-	@recordings_db.each { | recording |
-	  p recording.class, recording
-	  recording[1].delete! unless found_directories.include?(recording[1].directory)
-	}
+    basedir = '/vdr'
+    found_directories = Array.new
+    Find.find(basedir) { | entry |
+      entry.force_encoding('BINARY')
+      # Look for the index file created by VDR
+      if File.basename(entry) == "index" then
+        directory = File.dirname(entry)
+        unless directory.end_with?('.del') # These directories have been marked as deleted from VDR...
+          found_directories << directory
+          if @recordings_db[directory] == nil then
+            # Found a new entry
+            p directory
+            p add(directory)
+          end
+        end
+      end
+    }
+    @recordings_db.each { | recording |
+      p recording.class, recording
+      recording[1].delete! unless found_directories.include?(recording[1].directory)
+    }
   end
   def dump()
-	File.open('/vdr/rubyVDRconvert.recordings.marshal', 'wb:ascii-8bit') { | f |
-	  f.write(Marshal.dump(@recordings_db))
-	}
+    File.open('/vdr/rubyVDRconvert.recordings.marshal', 'wb:ascii-8bit') { | f |
+      f.write(Marshal.dump(@recordings_db))
+    }
   end
   def load()
-	begin
-	  data = File.read('/vdr/rubyVDRconvert.recordings.marshal')
-	  @recordings_db = Marshal.load(data)
-	rescue
-	  @recordings_db = Hash.new
-	end
+    begin
+      data = File.read('/vdr/rubyVDRconvert.recordings.marshal')
+      @recordings_db = Marshal.load(data)
+    rescue
+      @recordings_db = Hash.new
+    end
   end
   def add(directory)
-	# 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]
+    # 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
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Daniel Frank
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-21 00:00:00 +01:00
+date: 2010-12-07 00:00:00 +01:00
 default_executable: 
 dependencies: []