#306

backend/app/services/google_drive/api_client.rb

@@ -11,6 +11,7 @@ module GoogleDrive
     DRIVE_ENDPOINT = 'https://www.googleapis.com/drive/v3'
     TOKEN_ENDPOINT = 'https://oauth2.googleapis.com/token'
     FOLDER_MIME_TYPE = 'application/vnd.google-apps.folder'
+    NATIVE_FILE_MIME_TYPE_PREFIX = 'application/vnd.google-apps.'
     DRIVE_SCOPE = 'https://www.googleapis.com/auth/drive.readonly'
 
     def initialize service_account_email: ENV['GOOGLE_DRIVE_SERVICE_ACCOUNT_EMAIL'],
@@ -27,6 +28,7 @@ module GoogleDrive
       files = []
       walk_folder(folder_id, nil) do |entry, relative_path|
         next if entry['mimeType'] == FOLDER_MIME_TYPE
+        next if native_file?(entry['mimeType'])
 
         files << build_file_entry(entry, relative_path)
       end
@@ -35,6 +37,8 @@ module GoogleDrive
 
     def fetch_material_file file_id
       metadata = get_file(file_id)
+      return nil if native_file?(metadata['mimeType'])
+
       build_file_entry(metadata, metadata['name'])
     end
 
@@ -85,6 +89,7 @@ module GoogleDrive
         name: entry['name'],
         mime_type: entry['mimeType'],
         relative_path: MaterialSyncExportPath.normalize_path(relative_path),
+        sha256_checksum: entry['sha256Checksum'],
         web_view_link: entry['webViewLink'],
         web_content_link: entry['webContentLink'] }
     end
@@ -97,7 +102,8 @@ module GoogleDrive
         response =
             request_json('/files', {
                 q: "'#{ folder_id }' in parents and trashed = false",
-                fields: 'nextPageToken,files(id,name,mimeType,webViewLink,webContentLink)',
+                fields: 'nextPageToken,files(id,name,mimeType,sha256Checksum,' \
+                        'webViewLink,webContentLink)',
                 orderBy: 'folder,name',
                 pageSize: 1000,
                 supportsAllDrives: true,
@@ -113,7 +119,7 @@ module GoogleDrive
 
     def get_file file_id
       request_json("/files/#{ file_id }",
-                   fields: 'id,name,mimeType,webViewLink,webContentLink',
+                   fields: 'id,name,mimeType,sha256Checksum,webViewLink,webContentLink',
                    supportsAllDrives: true)
     end
 
@@ -127,13 +133,14 @@ module GoogleDrive
     end
 
     def request_binary path, params = {}
-      response = request(:get, path, params:)
-      unless response.is_a?(Net::HTTPSuccess)
-        raise "Google Drive download error: #{ response.code } #{ response.body }"
-      end
+      request(:get, path, params:) do |response|
+        unless response.is_a?(Net::HTTPSuccess)
+          raise "Google Drive download error: #{ response.code } #{ response.body }"
+        end
 
-      response.read_body do |chunk|
-        yield chunk
+        response.read_body do |chunk|
+          yield chunk
+        end
       end
     end
 
@@ -156,7 +163,13 @@ module GoogleDrive
                       use_ssl: true,
                       open_timeout: 10,
                       read_timeout: 60) do |http|
-        http.request(request)
+        if block_given?
+          http.request(request) do |response|
+            return yield response
+          end
+        else
+          http.request(request)
+        end
       end
     end
 
@@ -205,5 +218,9 @@ module GoogleDrive
 
       OpenSSL::PKey::RSA.new(raw)
     end
+
+    def native_file? mime_type
+      mime_type.to_s.start_with?(NATIVE_FILE_MIME_TYPE_PREFIX)
+    end
   end
 end