dis 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e288aeab069c9e9d3e65daeb330c4a28cd639d9d83a70cad85b91fbcc156d91c
-  data.tar.gz: c9b4fd556e84eb7e3ade9155f62fdc0e7220b1fdbf1fef601255ece90b8df530
+  metadata.gz: '0118e21d454d4ce58bcf4ad8d3abc5a5eece09f7aa425869e04853d6a6a3ea10'
+  data.tar.gz: 9cb58ea82f314f2c615a40773fa8e3e283171bbe6e0673c9f8938324c334d7c7
 SHA512:
-  metadata.gz: 7d61a6b68917905cd896300e7413e8676d7562cdd96599c6331928da12ef6f8a6bdc7ad2c7cfaccc3fff5d42bed45f6f123a1bf1f0138689dd2c26070f9c7ebe
-  data.tar.gz: b75616ead369930d1a52b2778afd50af9f252d75bad020836762b5247289cd4fe805fc2791b19158fdc1926d22313eb2240e5c441e8d0ac04589d966e2209a2b
+  metadata.gz: 35ad213ed5e7765c117fca8cc1b9496b348c93366996451bd44c93cadac33cd147580fd28f317ad4be83ee3db8304a4074bb53c692a96a230956aeb400ab8269
+  data.tar.gz: 54929beef973a5c1fbfa1e938c39e0bde0a2977d577325523dcf1d4eafe824b98e64ef2ac8d1d47cd2e4717341591fc659913b3a2dddd5fe2eae8195c603ae85

data/lib/dis/layer.rb

@@ -97,6 +97,14 @@ module Dis
       store!(type, key, file)
     end
 
+    # Returns all the given keys that exist in the layer.
+    #
+    #    layer.existing("documents", keys)
+    def existing(type, keys)
+      list = directory(type, keys.first).files.map(&:key)
+      keys.select { |key| list.include?(key_component(type, key)) }
+    end
+
     # Returns true if a object with the given key exists.
     #
     #    layer.exists?("documents", key)

data/lib/dis/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Dis
-  VERSION = '1.1.3'.freeze
+  VERSION = '1.1.4'.freeze
 end

data/lib/tasks/dis.rake

@@ -27,19 +27,13 @@ namespace :dis do
 
       Dis::Storage.layers.each do |layer|
         print "Checking #{layer.name}... "
-        existing = objects
-                   .pmap { |hash| [hash, layer.exists?(model.dis_type, hash)] }
-                   .select(&:last)
-                   .map(&:first)
+
+        existing = layer.existing(model.dis_type, objects)
         missing = objects - existing
         global_missing -= existing
         puts "#{existing.length} existing, #{missing.length} missing"
 
-        next unless layer.delayed? #&& layer.writeable?
-
-        jobs += missing.pmap do |hash|
-          [model.dis_type, hash] if Dis::Storage.exists?(model.dis_type, hash)
-        end.compact
+        next unless layer.delayed?
       end
 
       if global_missing.any?
@@ -47,6 +41,10 @@ namespace :dis do
         pp global_missing
       end
 
+      jobs += (objects - global_missing).pmap do |hash|
+        [model.dis_type, hash]
+      end.compact
+
       puts
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dis
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails