flickrage 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9ee1a397bd1661afccb8def2e52abca69b50eec
-  data.tar.gz: 763e29b08d260383ca77c1b6ed45c9884bc44dfb
+  metadata.gz: 847af86d9e43d42df3b1b988ac8a0d9bff7aff75
+  data.tar.gz: 590ec13f794cb3a22b1d2182ddf76088e147c8c8
 SHA512:
-  metadata.gz: 59850dd2bd9e17027df0c114328830fe78f97f965077c71af40747864844f3b8ff308244f114a707af5cfc7c6506f68b112b7487046e344f4597cd6a90fb945d
-  data.tar.gz: c4208d19727f769550235a01c9f8f637a08785b39be5dad142d56011b8c99eeabb688a85e38da4eb746233e59d9aebf6ec78b0adf99b77f9550dcc1acfe05b20
+  metadata.gz: de533e78326980bf3e4f91fd0eea9eab3c062c930c5cba58b5e856f7e856a9b0543bdb0f0779b1f1b82c6af5ab9709dbf4a0a3b37c053002be2bd6040d3a432d
+  data.tar.gz: 5fa397e6a465cd2d82ca5c94c9d82f48edead68da0541001b2ee80cf2dce12776fa90b808e39e7496953ec3a6659242407f6df11b4e2e965e5eff023014be948

data/README.md

@@ -93,6 +93,7 @@ Provide your own words dictionary:
           [--file-name=./some.png]                       # Name for the file with collage.
           [--dict-path=/usr/share/dict/words]            # Path to the file with multiline words (dictionary).
       -c, [--cleanup], [--no-cleanup]                    # Cleanup files before collage.
+      -t, [--tagged-search], [--no-tagged-search]        # Search by tags.
       -v, [--verbose], [--no-verbose]                    # Verbose mode.
       -q, [--quiet], [--no-quiet]                        # Quiet mode. If don't need any messages and in console.
           [--flickr-api-key=YOURLONGAPIKEY]              # FLICKR_API_KEY. if you can't use environment.

data/lib/flickrage.rb

@@ -31,6 +31,8 @@ module Flickrage
   setting :pool_size, 5
   setting :pool
 
+  setting :tagged_search, false
+
   setting :search_timeout, 30
   setting :download_timeout, 10
 

data/lib/flickrage/cli.rb

@@ -111,6 +111,11 @@ module Flickrage
                   type: :boolean,
                   aliases: %w(-c),
                   desc: 'Cleanup files before collage.'
+    method_option :tagged_search,
+                  default: false,
+                  aliases: %w(-t),
+                  type: :boolean,
+                  desc: 'Search by tags.'
     method_option :verbose,
                   type: :boolean,
                   aliases: %w(-v),
@@ -200,6 +205,8 @@ module Flickrage
           config.max    = options['max']  if options['max']
           config.grid   = options['grid'] if options['grid']
           config.output = options['output']
+
+          config.tagged_search = options['tagged_search']
         end
       end
 

data/lib/flickrage/service/downloader.rb

@@ -9,7 +9,7 @@ module Flickrage
 
       def run(image)
         uri = gen_uri(image.url)
-        image.file_name = file_name(uri)
+        image.file_name = file_name(uri) unless image.file_name
         download_file(uri, image.local_path)
         check_image(image)
       rescue StandardError => e
@@ -19,45 +19,53 @@ module Flickrage
 
       private
 
-      def download_file(uri, path, limit = Flickrage.config.download_timeout)
+      def download_file(uri, path, mode = 'wb')
+        File.open(path, mode) do |file|
+          file.flock(File::LOCK_EX)
+          parse_file(uri, file)
+        end
+      rescue => e
+        FileUtils.rm_f(path) if File.size(path).zero?
+        raise e
+      end
+
+      def parse_file(uri, file, limit = Flickrage.config.download_timeout)
         raise Flickrage::DownloadError, 'Redirect limit arrived' if limit.zero?
 
         Net::HTTP.start(uri.host, uri.port,
                         use_ssl: uri.scheme == 'https') do |conn|
-          request = Net::HTTP::Get.new(uri)
-          response = conn.request request
-
-          case response
-          when Net::HTTPSuccess
-            write_file(path, response.body)
-          when Net::HTTPRedirection
-            download_file(gen_uri(response['location']),
-                          path,
-                          limit - 1)
-          else
-            response.error!
+          conn.request_get(uri.path) do |response|
+            case response
+            when Net::HTTPSuccess
+              response.read_body do |seg|
+                file << seg
+              end
+            when Net::HTTPRedirection
+              download_file(gen_uri(response['location']),
+                            path,
+                            limit - 1)
+            else
+              response.error!
+            end
           end
         end
       end
 
-      def write_file(path, body, mode = 'wb')
-        File.open(path, mode) do |file|
-          file.flock(File::LOCK_EX)
-          file << body
-        end
-      end
-
       def gen_uri(url)
         URI.parse(url)
       end
 
       def file_name(uri)
-        File.basename(uri.path)
+         "#{nsec}_" + File.basename(uri.path)
       end
 
       def check_image(image)
         File.exist?(image.local_path) ? image.finish_download : image
       end
+
+      def nsec
+        Time.now.nsec
+      end
     end
   end
 end

data/lib/flickrage/service/search.rb

@@ -4,6 +4,12 @@ module Flickrage
     class Search
       include Flickrage::Helpers::Log
 
+      attr_reader :tagged_search
+
+      def initialize
+        @tagged_search = Flickrage.config.tagged_search
+      end
+
       def run(keyword)
         result = search(keyword)
 
@@ -31,7 +37,7 @@ module Flickrage
       end
 
       def search(keyword)
-        flickr.photos.search(params(text: keyword))
+        flickr.photos.search(params(search_query(keyword)))
       end
 
       def title(text)
@@ -48,6 +54,14 @@ module Flickrage
           pages: 1
         }.merge(opts)
       end
+
+      def search_query(keyword)
+        if tagged_search
+          {tags: [keyword]}
+        else
+          {text: keyword}
+        end
+      end
     end
   end
 end

data/lib/flickrage/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Flickrage
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/lib/flickrage/worker/search.rb

@@ -5,7 +5,7 @@ module Flickrage
       include Flickrage::Helpers::Dict
 
       def call
-        keywords = opts['keywords'] || %w()
+        keywords = opts['keywords']&.first(Flickrage.config.max) || %w()
 
         keywords += sample_words(Flickrage.config.max - keywords.size) if keywords.size < Flickrage.config.max
         keys = keywords.join(', ')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickrage
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Alexander Merkulov