rubyVDRconvert 0.0.3 → 0.0.4

data/bin/rubyVDRconvert

@@ -4,13 +4,15 @@
 # TODO: Write the daemon
 
 require 'rubygems'
+#gem 'rubyVDRconvert'
 
-require 'lib/recordings.rb'
+require 'recordings.rb'
 
 recordings = Recordings.new
 recordings.load
 
 while true
   recordings.scan
+  recordings.dump
   sleep 300
-end
+end

data/lib/file_dir.rb

@@ -2,13 +2,14 @@ require 'find'
 
 class FileDir
   def self.delete!(filedir)
+	p filedir
 	case Dir.exist?(filedir)
 	  when true
 		begin
 		  Dir.rmdir(filedir)
 		rescue
 		  Dir.foreach(filedir) { | entry |
-			delete!(entry) unless (entry == ".") or (entry == "..")
+			delete!(filedir + '/' + entry) unless (entry == ".") or (entry == "..")
 		  }
 		  retry
 		end
@@ -28,4 +29,4 @@ class FileDir
 	  retry
 	end
   end
-end
+end

data/lib/recording.rb

@@ -19,11 +19,27 @@ class Recording
 	load_info
 	update_target_dir
 	determine_stream_type
+	p "New recording: #{@friendly_name}"
+  end
+  def marshal_dump()
+	[ @directory, @recording, @title, @subtitle, @friendly_name, @target_dir, @processed, @timestamp ]
+  end
+  def marshal_load(variables)
+	@mutex = Mutex.new
+	@directory = variables[0]
+	@recording = variables[1]
+	@title = variables[2]
+	@subtitle = variables[3]
+	@friendly_name = variables[4]
+	@target_dir = variables[5]
+	@processed = variables[6]
+	@timestamp = variables[7]
   end
   def delete!()
 	@mutex.synchronize {
 	  @recording = nil
 	  GC.start
+	  p "Deleting....", self, @target_dir
 	  FileDir.delete!(@target_dir)
 	}
   end
@@ -64,8 +80,9 @@ class Recording
 	@friendly_name = "#{title} - #{subtitle}"	
   end
   def process!()
+	p "Starting processing of #{@friendly_name}"
 	@mutex.synchronize{
 	  @processed = true if @recording.process!
 	}
   end
-end
+end

data/lib/recordings.rb

@@ -19,16 +19,17 @@ class Recordings
 		if @recordings_db[directory] == nil then
 		  # Found a new entry
 		  p directory
-		  add(directory)
+		  p add(directory)
 		end
 	  end
 	}
 	@recordings_db.each { | recording |
-	  recording.delete! unless found_directories.include?(recording.directory)
+	  p recording.class, recording
+	  recording[1].delete! unless found_directories.include?(recording[1].directory)
 	}
   end
   def dump()
-	File.new('/vdr/rubyVDRconvert.recordings.marshal', 'wb:ascii-8bit') { | f |
+	File.open('/vdr/rubyVDRconvert.recordings.marshal', 'wb:ascii-8bit') { | f |
 	  f.write(Marshal.dump(@recordings_db))
 	}
   end
@@ -44,8 +45,11 @@ 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
-	return false if (Time.now - File.mtime(directory + '/index')) > 30
+	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
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Daniel Frank
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-07 00:00:00 +01:00
+date: 2010-11-16 00:00:00 +01:00
 default_executable: 
 dependencies: []