lib/carrierwave/storage/aliyun_file.rb in carrierwave-aliyun-1.1.0 vs lib/carrierwave/storage/aliyun_file.rb in carrierwave-aliyun-1.1.1

@@ -1,26 +1,27 @@
 # frozen_string_literal: true
 
 module CarrierWave
   module Storage
-    class AliyunFile < CarrierWave::SanitizedFile
-      attr_reader :path
+    class AliyunFile
+      attr_reader :uploader, :path
 
+      alias_method :filename, :path
+      alias_method :identifier, :filename
+
       def initialize(uploader, base, path)
-        @uploader = uploader
-        @path     = URI.encode(path)
-        @base     = base
+        @uploader, @path, @base = uploader, URI.encode(path), base
       end
 
       def read
-        object, body = bucket.get(@path)
+        object, body = bucket.get(path)
         @headers = object.headers
         body
       end
 
       def delete
-        bucket.delete(@path)
+        bucket.delete(path)
         true
       rescue => e
         # If the file's not there, don't panic
         puts "carrierwave-aliyun delete file failed: #{e}"
         nil
@@ -31,13 +32,13 @@
       # params
       #    :thumb - Aliyun OSS Image Processor option, etc: @100w_200h_95q
       #
       def url(opts = {})
         if bucket.mode == :private
-          bucket.private_get_url(@path, opts)
+          bucket.private_get_url(path, opts)
         else
-          bucket.path_to_url(@path, opts)
+          bucket.path_to_url(path, opts)
         end
       end
 
       def content_type
         headers[:content_type]
@@ -47,25 +48,52 @@
         headers[:content_type] = new_content_type
       end
 
       def store(new_file, headers = {})
         if new_file.is_a?(self.class)
-          new_file.move_to(path)
+          new_file.copy_to(path)
         else
-          bucket.put(@path, new_file, headers)
+          fog_file = new_file.to_file
+          bucket.put(path, fog_file, headers)
+          fog_file.close if fog_file && !fog_file.closed?
         end
+        true
       end
 
       def headers
-        @headers ||= {}
+        @headers ||= begin
+          obj = bucket.head(path)
+          obj.headers
+        end
       end
 
+      def exists?
+        !!headers
+      end
+
+      def copy_to(new_path)
+        bucket.copy_object(path, new_path)
+        self.class.new(uploader, @base, new_path)
+      end
+
+      def extension
+        path_elements = path.split(".")
+        path_elements.last if path_elements.size > 1
+      end
+
+      def original_filename
+        return @original_filename if @original_filename
+        if @file && @file.respond_to?(:original_filename)
+          @file.original_filename
+        elsif path
+          ::File.basename(path)
+        end
+      end
+
       private
 
         def bucket
-          return @bucket if defined? @bucket
-
-          @bucket = CarrierWave::Aliyun::Bucket.new(@uploader)
+          @bucket ||= CarrierWave::Aliyun::Bucket.new(uploader)
         end
     end
   end
 end