5apps/liquor-cabinet
5apps/liquor-cabinet
4
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Activity

Use actual Last-Modified time we get from Swift

Browse Source
This commit is contained in:
Garret Alfert 2016-03-02 14:00:59 +01:00
parent d18de83893
commit 19f6fcd068
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
migrate_metadata_to_redis.rb
View File

@ -76,7 +76,7 @@ class Migrator
# get dir listing and repeat # get dir listing and repeat
work_on_dir(item, "#{parent_directory}#{directory}") work_on_dir(item, "#{parent_directory}#{directory}")
else else
save_document_data("#{parent_directory}#{directory}", item, data, timestamp) save_document_data("#{parent_directory}#{directory}", item, data)
end end
add_item_to_parent_dir("#{parent_directory}#{directory}", item) add_item_to_parent_dir("#{parent_directory}#{directory}", item)
@ -92,19 +92,22 @@ class Migrator
def save_directory_data(dir, item, data, timestamp) def save_directory_data(dir, item, data, timestamp)
key = "rs_meta:#{username}:#{dir.gsub(/^\//, "")}#{item}" key = "rs_meta:#{username}:#{dir.gsub(/^\//, "")}#{item}"
metadata = {etag: data["ETag"], modified: timestamp} metadata = {
etag: data["ETag"],
modified: timestamp_for(data["Last-Modified"])
}
logger.debug "Metadata for dir #{key}: #{metadata}" logger.debug "Metadata for dir #{key}: #{metadata}"
redis.hmset(key, *metadata) unless dry_run redis.hmset(key, *metadata) unless dry_run
end end
def save_document_data(dir, item, data, timestamp) def save_document_data(dir, item, data)
key = "rs_meta:#{username}:#{dir.gsub(/^\//, "")}#{item}" key = "rs_meta:#{username}:#{dir.gsub(/^\//, "")}#{item}"
metadata = { metadata = {
etag: data["ETag"], etag: data["ETag"],
size: data["Content-Length"], size: data["Content-Length"],
type: data["Content-Type"], type: data["Content-Type"],
modified: timestamp modified: timestamp_for(data["Last-Modified"])
} }
logger.debug "Metadata for document #{key}: #{metadata}" logger.debug "Metadata for document #{key}: #{metadata}"
redis.hmset(key, *metadata) unless dry_run redis.hmset(key, *metadata) unless dry_run
@ -118,6 +121,10 @@ class Migrator
end end
end end
def timestamp_for(date)
return DateTime.parse(date).strftime("%Q").to_i
end
def redis def redis
@redis ||= Redis.new(@settings["redis"].symbolize_keys) @redis ||= Redis.new(@settings["redis"].symbolize_keys)
end end
@ -159,6 +166,7 @@ class Migrator
listing["items"].merge!({ listing["items"].merge!({
name => { name => {
"ETag" => entry["hash"], "ETag" => entry["hash"],
"Last-Modified" => entry["last_modified"]
} }
}) })
else # It's a file else # It's a file
@ -166,7 +174,8 @@ class Migrator
name => { name => {
"ETag" => entry["hash"], "ETag" => entry["hash"],
"Content-Type" => entry["content_type"], "Content-Type" => entry["content_type"],
"Content-Length" => entry["bytes"] "Content-Length" => entry["bytes"],
"Last-Modified" => entry["last_modified"]
} }
}) })
end end