entries = Dir.entries(dir).sort
#- populate config in case of gen_config, add new files in case of merge_config
for file in entries
- if file =~ /['"\(\)\[\]]/
- msg 1, _("Ignoring %s, contains one of forbidden characters: '\"()[]") % "#{dir}/#{file}"
+ if file =~ /['"\[\]]/
+ msg 1, _("Ignoring %s, contains one of forbidden characters: '\"[]") % "#{dir}/#{file}"
else
type = entry2type(file)
if type && !xmldir.elements["#{type}[@filename='#{utf8(file)}']"]
end
def entry2type(entry)
- if entry =~ /\.(jpg|jpeg|jpe|gif|bmp|png)$/i && entry !~ /['"\(\)\[\]]/
+ if entry =~ /\.(jpg|jpeg|jpe|gif|bmp|png)$/i && entry !~ /['"\[\]]/
return 'image'
- elsif entry =~ /\.(mov|avi|mpg|mpeg|mpe|wmv|asx)$/i && entry !~ /['"\(\)\[\]]/
+ elsif entry =~ /\.(mov|avi|mpg|mpeg|mpe|wmv|asx)$/i && entry !~ /['"\[\]]/
#- might consider using file magic later..
return 'video'
else