rubyVDRconvert 0.0.3 → 0.0.4
Sign up to get free protection for your applications and to get access to all the features.
- data/bin/rubyVDRconvert +4 -2
- data/lib/file_dir.rb +3 -2
- data/lib/recording.rb +18 -1
- data/lib/recordings.rb +9 -5
- metadata +3 -3
data/bin/rubyVDRconvert
CHANGED
@@ -4,13 +4,15 @@
|
|
4
4
|
# TODO: Write the daemon
|
5
5
|
|
6
6
|
require 'rubygems'
|
7
|
+
#gem 'rubyVDRconvert'
|
7
8
|
|
8
|
-
require '
|
9
|
+
require 'recordings.rb'
|
9
10
|
|
10
11
|
recordings = Recordings.new
|
11
12
|
recordings.load
|
12
13
|
|
13
14
|
while true
|
14
15
|
recordings.scan
|
16
|
+
recordings.dump
|
15
17
|
sleep 300
|
16
|
-
end
|
18
|
+
end
|
data/lib/file_dir.rb
CHANGED
@@ -2,13 +2,14 @@ require 'find'
|
|
2
2
|
|
3
3
|
class FileDir
|
4
4
|
def self.delete!(filedir)
|
5
|
+
p filedir
|
5
6
|
case Dir.exist?(filedir)
|
6
7
|
when true
|
7
8
|
begin
|
8
9
|
Dir.rmdir(filedir)
|
9
10
|
rescue
|
10
11
|
Dir.foreach(filedir) { | entry |
|
11
|
-
delete!(entry) unless (entry == ".") or (entry == "..")
|
12
|
+
delete!(filedir + '/' + entry) unless (entry == ".") or (entry == "..")
|
12
13
|
}
|
13
14
|
retry
|
14
15
|
end
|
@@ -28,4 +29,4 @@ class FileDir
|
|
28
29
|
retry
|
29
30
|
end
|
30
31
|
end
|
31
|
-
end
|
32
|
+
end
|
data/lib/recording.rb
CHANGED
@@ -19,11 +19,27 @@ class Recording
|
|
19
19
|
load_info
|
20
20
|
update_target_dir
|
21
21
|
determine_stream_type
|
22
|
+
p "New recording: #{@friendly_name}"
|
23
|
+
end
|
24
|
+
def marshal_dump()
|
25
|
+
[ @directory, @recording, @title, @subtitle, @friendly_name, @target_dir, @processed, @timestamp ]
|
26
|
+
end
|
27
|
+
def marshal_load(variables)
|
28
|
+
@mutex = Mutex.new
|
29
|
+
@directory = variables[0]
|
30
|
+
@recording = variables[1]
|
31
|
+
@title = variables[2]
|
32
|
+
@subtitle = variables[3]
|
33
|
+
@friendly_name = variables[4]
|
34
|
+
@target_dir = variables[5]
|
35
|
+
@processed = variables[6]
|
36
|
+
@timestamp = variables[7]
|
22
37
|
end
|
23
38
|
def delete!()
|
24
39
|
@mutex.synchronize {
|
25
40
|
@recording = nil
|
26
41
|
GC.start
|
42
|
+
p "Deleting....", self, @target_dir
|
27
43
|
FileDir.delete!(@target_dir)
|
28
44
|
}
|
29
45
|
end
|
@@ -64,8 +80,9 @@ class Recording
|
|
64
80
|
@friendly_name = "#{title} - #{subtitle}"
|
65
81
|
end
|
66
82
|
def process!()
|
83
|
+
p "Starting processing of #{@friendly_name}"
|
67
84
|
@mutex.synchronize{
|
68
85
|
@processed = true if @recording.process!
|
69
86
|
}
|
70
87
|
end
|
71
|
-
end
|
88
|
+
end
|
data/lib/recordings.rb
CHANGED
@@ -19,16 +19,17 @@ class Recordings
|
|
19
19
|
if @recordings_db[directory] == nil then
|
20
20
|
# Found a new entry
|
21
21
|
p directory
|
22
|
-
add(directory)
|
22
|
+
p add(directory)
|
23
23
|
end
|
24
24
|
end
|
25
25
|
}
|
26
26
|
@recordings_db.each { | recording |
|
27
|
-
recording.
|
27
|
+
p recording.class, recording
|
28
|
+
recording[1].delete! unless found_directories.include?(recording[1].directory)
|
28
29
|
}
|
29
30
|
end
|
30
31
|
def dump()
|
31
|
-
File.
|
32
|
+
File.open('/vdr/rubyVDRconvert.recordings.marshal', 'wb:ascii-8bit') { | f |
|
32
33
|
f.write(Marshal.dump(@recordings_db))
|
33
34
|
}
|
34
35
|
end
|
@@ -44,8 +45,11 @@ class Recordings
|
|
44
45
|
# TODO: Add a new recording that was found in the specified directory
|
45
46
|
# Ensure that VDR has finished writing the recording by checking the mtime of the index file
|
46
47
|
# Wait at least 30 seconds after VDR has finished
|
47
|
-
|
48
|
+
p Time.now - File.mtime(directory + '/index')
|
49
|
+
return false unless (Time.now - File.mtime(directory + '/index')) > 30
|
50
|
+
p "Old enough... continuing."
|
48
51
|
@recordings_db[directory] = Recording.new(directory)
|
49
52
|
@recordings_db[directory].process!
|
53
|
+
p @recordings_db[directory]
|
50
54
|
end
|
51
|
-
end
|
55
|
+
end
|
metadata
CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
5
5
|
segments:
|
6
6
|
- 0
|
7
7
|
- 0
|
8
|
-
-
|
9
|
-
version: 0.0.
|
8
|
+
- 4
|
9
|
+
version: 0.0.4
|
10
10
|
platform: ruby
|
11
11
|
authors:
|
12
12
|
- Daniel Frank
|
@@ -14,7 +14,7 @@ autorequire:
|
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
16
|
|
17
|
-
date: 2010-11-
|
17
|
+
date: 2010-11-16 00:00:00 +01:00
|
18
18
|
default_executable:
|
19
19
|
dependencies: []
|
20
20
|
|