uas2git 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61411d7ba4da079f4c10ec1089dfc39b230cae0f
-  data.tar.gz: 3bee5c6e7ba9b2b4786211873dfc291a51956e94
+  metadata.gz: b2b19bc2bc78262e8dc5261a3835e8c0268b944b
+  data.tar.gz: bb591d0df72a7ff57184d20e1525e45cff0c7136
 SHA512:
-  metadata.gz: e3990fdc0d8405160c71b7b2f16041a9fbf721e108745925e220c958711f433c571d5440b12a61a23ff23d38ba70078158d19e3cd3f8a4f14be5961b7e17a1bf
-  data.tar.gz: 9700dfcf9a4e253661213163db487a97ffa55be08e559b3a93a355b1dd85becf5eba415db86f27785a63f72292f6504b24521be9dda2d455affc1e4b88c77fd9
+  metadata.gz: 657ad52b78256644bcfd3bf0cbf24f5703a35f3b0478b4ca002b911b477696152285d92d5b92338c62136f6f880463019f73a43f3986eb8fc442c3e476cee34d
+  data.tar.gz: 9ed83b1077de6d7404ef44a9ac09c2e558fa6a17bae7d0b8b60dff46e2f55227033ea483c7837c4b0056a91c7a945657ebd059e2500dddeffad608b68faabde4

data/lib/uas2git.rb

@@ -1,3 +1,4 @@
 require 'uas2git/version'
+require 'uas2git/lo_reader'
 require 'uas2git/migration'
 require 'uas2git/uas'

data/lib/uas2git/lo_reader.rb

@@ -0,0 +1,26 @@
+module Uas2Git
+  class LOReader
+    def initialize(connection)
+      @connection = connection
+    end
+
+    def open(stream, &block)
+      @connection.transaction do
+        begin
+          @fd = @connection.lo_open(stream)
+
+          r = yield self
+
+        ensure
+          @connection.lo_close(@fd)
+
+          r
+        end
+      end
+    end
+
+    def read(size)
+      @connection.lo_read(@fd, size)
+    end
+  end
+end

data/lib/uas2git/migration.rb

@@ -49,23 +49,10 @@ module Uas2Git
         asset_versions.find_each do |asset_version|
           Progress.step do
             asset_version.contents.each do |contents|
-              blob = ''
-
-              asset_version.transaction do
-                fd = asset_version.class.connection.raw_connection.lo_open(contents.stream, PG::INV_READ)
-
-                loop do
-                  data = asset_version.class.connection.raw_connection.lo_read(fd, 65536)
-                  break if data == nil || data.empty?
-
-                  blob += data
-                end
-
-                asset_version.class.connection.raw_connection.lo_close(fd)
+              oid = LOReader.new(asset_version.class.connection.raw_connection).open(contents.stream) do |lo|
+                Rugged::Blob.from_chunks(repo, lo)
               end
 
-              oid = repo.write(blob, :blob)
-
               if contents.tag == 'asset' then
                 oids[asset_version.asset.serial] = {} if oids[asset_version.asset.serial].nil?
                 oids[asset_version.asset.serial][asset_version.revision] = oid
@@ -215,7 +202,7 @@ fileFormatVersion: 2
 guid: #{guid_string}
 folderAsset: yes
 DefaultImporter:
-  userData:
+  userData:\s
 EOF
     end
 

data/lib/uas2git/version.rb

@@ -1,3 +1,3 @@
 module UAS2Git
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uas2git
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Toru Nayuki
@@ -138,6 +138,7 @@ files:
 - Vagrantfile
 - bin/uas2git
 - lib/uas2git.rb
+- lib/uas2git/lo_reader.rb
 - lib/uas2git/migration.rb
 - lib/uas2git/uas.rb
 - lib/uas2git/version.rb