googledrive-easy 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bde25654cb7729aa6b698cb13142bea88ed013117cdf4af338e1c4fa65d96593
-  data.tar.gz: dd6e91d0cfb1a7f54fc265b8da75d043b3c2582aaf6b907e77289c4aade92d06
+  metadata.gz: 51e1f97fea32cd6c6a79139ee346ea800e72118a838bd251bd880a5021fb25cf
+  data.tar.gz: 682a6aa41494fc95c9505af855ff03091cea00bd91ba359bac73d6598a8d53ac
 SHA512:
-  metadata.gz: 7eca3c50d329df741fece7ec1ddc0188bd938f9e1826374e887192ae405741516e91d794c86d6bd15e68135bda8fbc1c131d6a3e4b28d68e1d2237894fc5b8e6
-  data.tar.gz: e02255813a9a3e15bdf013eaeed3e71b42767fce79af7c44eda1ecba4ed304bcc5d59e015be2959597b1256dd899676aeec2959134c88c8fdeaeb2e6c681317d
+  metadata.gz: eedd2bc6b9d08d3f3a65c20ca49392363f985d4477e561f11bce8792ba621b58e02ff20efeb510446d0ea7f19a9469ca9876b6408c3eca1949615504057ddfed
+  data.tar.gz: cefb219271d283b419e38264e584f85c4f298a3c318531765203deba6afce49c06c072e61c40da941832e0e9bbfe3b7d1ae39c5b8bef260f74ca0c3e1c1768c9

data/lib/googledrive-easy.rb

@@ -397,7 +397,23 @@ class GoogleDrive
     # parent folder has to be surrounded by single quotes in query
     query += " and ('#{parentfolderid}' in parents)" if parentfolderid
     # filename has to be surrounded by single quotes in query
-    query += " and (name #{ name =~ /\*/ ? "contains" : "=" } '#{name}')" if name
+
+    if name
+      name.split("*").each_with_index do |part, idx|
+        if idx == 0 and name =~ /\*/ and part.size > 0
+          # If the above are true, this is the first piece, and it was followed by a *, so we should pass it in the
+          # format for prefix matching
+          query += " and (name contains \"#{part}\")"
+        elsif idx == 0 and !(name =~ /\*/ )
+          # If the above is true, this is a literal equivalence search, no wildcards should be used.
+          query += " and (name = \"#{part}\")"
+        else
+          # If we're here, either we had a wildcard prefix, or we're on a later part of the search term. Do a contains.
+          query += " and (fullText contains \"#{part}\")" if part.size > 0
+        end
+      end
+    end
+    @logger.debug("Searching with query: #{query}")
 
     files = [ ]
     next_page_token = nil
@@ -420,7 +436,6 @@ class GoogleDrive
       processed_files << process_file(file)
     end
 
-    # Todo: Is this still really necessary? I think the list_files function can do this server-side. Need to research.
     # we have additional processing to do it a wildcard character was passed. Because Google Drive "contains" returns all portions of it.
     # so we need to filter here
     if name =~ /\*/ # if name contains wildcard

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: googledrive-easy
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Mike Bullock