mediafile 0.2.5 → 0.2.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/mediafile/bulkmediacopy.rb +11 -3
- data/lib/mediafile/mediafile.rb +11 -4
- data/lib/mediafile/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 47506d6a96df6efa62b72d117da4393159a0a9aa
|
|
4
|
+
data.tar.gz: bf3a70da3618f60d2800917bf1bf69d0f40a41ba
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7379bef85aac9d0b4408d02c4c5dfacf409dad1c3507ea409634a2c8ce6b5ac9a21a5f8b0cb8b53848873ece9525c7a5b8411aae58ae9a90bce13c02f437e09c
|
|
7
|
+
data.tar.gz: 653d04667d4c0d8ddcc402ae211b4fa1311c811299095fd0979b10f75b8cda34e47a5a5e55a33e3c1f84232c656286095b6cb56ae93e187b64caff7c3f271dd5
|
|
@@ -120,8 +120,17 @@ class BulkMediaCopy
|
|
|
120
120
|
c = cur_perc == 100
|
|
121
121
|
finished = @count.to_f / @work.count * 100
|
|
122
122
|
f = finished == 100.0
|
|
123
|
+
puts dest
|
|
124
|
+
action = case
|
|
125
|
+
when File.exists?(dest)
|
|
126
|
+
'target already exists'
|
|
127
|
+
when @transcode[mediafile.type]
|
|
128
|
+
'transcode'
|
|
129
|
+
else
|
|
130
|
+
'copy'
|
|
131
|
+
end
|
|
123
132
|
print "%#{@width}d (%4.1f%%), %#{@width}d (%4.#{c ? 0 : 1}f%%), " \
|
|
124
|
-
"%#{@width}d (%4.#{f ? 0 : 1}f%%) ::
|
|
133
|
+
"%#{@width}d (%4.#{f ? 0 : 1}f%%) :: *%-s*\n source file => %-s\n " \
|
|
125
134
|
"destination => %-s\n" % [
|
|
126
135
|
left,
|
|
127
136
|
left_perc,
|
|
@@ -129,14 +138,13 @@ class BulkMediaCopy
|
|
|
129
138
|
cur_perc,
|
|
130
139
|
@count,
|
|
131
140
|
finished,
|
|
132
|
-
|
|
141
|
+
action,
|
|
133
142
|
(mediafile.source),
|
|
134
143
|
mediafile.out_path(transcode_table:@transcode)
|
|
135
144
|
]
|
|
136
145
|
end
|
|
137
146
|
debug "#{mediafile.type} == #{@transcode[mediafile.type]}"
|
|
138
147
|
}
|
|
139
|
-
|
|
140
148
|
err = false
|
|
141
149
|
begin
|
|
142
150
|
mediafile.copy transcode_table: @transcode
|
data/lib/mediafile/mediafile.rb
CHANGED
|
@@ -6,7 +6,7 @@ module MediaFile
|
|
|
6
6
|
class MediaFile
|
|
7
7
|
include ::MediaFile
|
|
8
8
|
|
|
9
|
-
attr_reader :source, :type, :name, :base_dir
|
|
9
|
+
attr_reader :source, :type, :name, :base_dir, :disposition
|
|
10
10
|
|
|
11
11
|
def initialize(full_path,
|
|
12
12
|
base_dir: '.',
|
|
@@ -21,10 +21,12 @@ class MediaFile
|
|
|
21
21
|
@type = full_path[/(\w+)$/].downcase.to_sym
|
|
22
22
|
@verbose = verbose
|
|
23
23
|
@debug = debug
|
|
24
|
+
@noop = false
|
|
24
25
|
@cover = File.join(
|
|
25
26
|
File.dirname(full_path),
|
|
26
27
|
'cover.jpg')
|
|
27
28
|
@cover = nil unless File.exist?(@cover)
|
|
29
|
+
@disposition = 'pending'
|
|
28
30
|
end
|
|
29
31
|
|
|
30
32
|
def source_md5
|
|
@@ -45,11 +47,12 @@ class MediaFile
|
|
|
45
47
|
debug "temp dest is '#{temp_dest}'"
|
|
46
48
|
|
|
47
49
|
if File.exist?(destination)
|
|
50
|
+
@noop = true
|
|
48
51
|
info("File already exists at destination: #{@source} => #{destination}")
|
|
49
52
|
return
|
|
50
53
|
end
|
|
51
54
|
|
|
52
|
-
unless
|
|
55
|
+
unless check_transfer(temp_dest)
|
|
53
56
|
error "Two source files mapped to the same destination file!"
|
|
54
57
|
error "This file: #{@source} => #{temp_dest}"
|
|
55
58
|
return
|
|
@@ -59,9 +62,13 @@ class MediaFile
|
|
|
59
62
|
FileUtils.mkdir_p File.dirname destination
|
|
60
63
|
FileUtils.touch temp_dest
|
|
61
64
|
begin
|
|
62
|
-
transcode_table.has_key?(@type)
|
|
63
|
-
transcode(transcode_table, temp_dest)
|
|
65
|
+
if transcode_table.has_key?(@type)
|
|
66
|
+
transcode(transcode_table, temp_dest)
|
|
67
|
+
@disposition = 'transcoded'
|
|
68
|
+
else
|
|
64
69
|
FileUtils.cp(@source, temp_dest)
|
|
70
|
+
@disposition = 'copied'
|
|
71
|
+
end
|
|
65
72
|
set_album_artist(temp_dest)
|
|
66
73
|
set_comment_and_title(temp_dest)
|
|
67
74
|
set_cover_art(temp_dest)
|
data/lib/mediafile/version.rb
CHANGED