flickrage 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 847af86d9e43d42df3b1b988ac8a0d9bff7aff75
-  data.tar.gz: 590ec13f794cb3a22b1d2182ddf76088e147c8c8
+  metadata.gz: faf81a6b4b8f404e02724e29dbc23585b3c07ad4
+  data.tar.gz: 4efb363c436ef90d9b814d703863266c4a5592f4
 SHA512:
-  metadata.gz: de533e78326980bf3e4f91fd0eea9eab3c062c930c5cba58b5e856f7e856a9b0543bdb0f0779b1f1b82c6af5ab9709dbf4a0a3b37c053002be2bd6040d3a432d
-  data.tar.gz: 5fa397e6a465cd2d82ca5c94c9d82f48edead68da0541001b2ee80cf2dce12776fa90b808e39e7496953ec3a6659242407f6df11b4e2e965e5eff023014be948
+  metadata.gz: bc0bd1e97a4e7bc5e882bec89eda6f2cad50fcf97b9d5df4d8d3277bce6e26a08d1ae82d6d359c675a9a4c6c258ec914b1232ceed9e8862cd1887a8bc257aa02
+  data.tar.gz: 53e3839d0ccf7304c7fd68c9560a63e8bab1b62dabe57597f867c8e53af8de0ba85d8907bb934db155391ad31fcdcc64afa899136ad9fa6904dcc8fff05dbe05

data/README.md

@@ -81,23 +81,25 @@ Provide your own words dictionary:
     > $ flickrage help c 
     
     Options:
-      -k, --keywords=some nice grapefruit                
-          [--max=10]                                     # Select number of files.
-                                                         # Default: 10
-                                                         # Possible values: 1, ..., 20
-          [--grid=2]                                     # Select grid base number.
-          [--width=120]                                  # Set width for resize downloaded images.
-          [--height=80]                                  # Set height for resize downloaded images.
-      -l, [--log=/Users/someone/.flickrage/main.log]     # Log file path. By default logging is disabled.
-      -o, [--output=./tmp]                               # Output directory, where all data will be stored.
-          [--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.
-          [--flickr-shared-secret=YOURLONGSHAREDSECRET]  # FLICKR_SHARED_SECRET. if you can't use environment.
+      -k, --keywords=some nice grapefruit                        
+          [--max=10]                                             # Select number of files.
+                                                                 # Default: 10
+                                                                 # Possible values: 1, ..., 20
+          [--grid=2]                                             # Select grid base number.
+          [--width=120]                                          # Set width for resize downloaded images.
+          [--height=80]                                          # Set height for resize downloaded images.
+      -l, [--log=/Users/someone/.flickrage/main.log]             # Log file path. By default logging is disabled.
+      -o, [--output=./tmp]                                       # Output directory, where all data will be stored.
+          [--file-name=./some.png]                               # Name for file with collage.
+          [--dict-path=/usr/share/dict/words]                    # Path to file with multiline words (dictionary).
+      -c, [--cleanup], [--no-cleanup]                            # Cleanup files before collage.
+      -t, [--tagged-search], [--no-tagged-search]                # Search by tags.
+      -p, [--params=safe_search:moderate sort:date-posted-desc]  # Set extra params for Flickr.
+      -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.
+          [--flickr-shared-secret=YOURLONGSHAREDSECRET]          # FLICKR_SHARED_SECRET. if you can't use environment.
+
   
     `flickrage` is a tool which loves search on the Flickr & making collages from findings.
     

data/lib/flickrage.rb

@@ -36,6 +36,7 @@ module Flickrage
   setting :search_timeout, 30
   setting :download_timeout, 10
 
+  setting :search_params, {}
   setting :grid, 2
   setting :max, 10
   setting :output

data/lib/flickrage/cli.rb

@@ -116,6 +116,11 @@ module Flickrage
                   aliases: %w(-t),
                   type: :boolean,
                   desc: 'Search by tags.'
+    method_option :params,
+                  type: :hash,
+                  aliases: %w( -p ),
+                  banner: 'safe_search:moderate sort:date-posted-desc',
+                  desc: 'Set extra params for Flickr.'
     method_option :verbose,
                   type: :boolean,
                   aliases: %w(-v),
@@ -202,11 +207,17 @@ module Flickrage
           config.width  = options['width']  if options['width']
           config.height = options['height'] if options['height']
 
-          config.max    = options['max']  if options['max']
           config.grid   = options['grid'] if options['grid']
           config.output = options['output']
 
           config.tagged_search = options['tagged_search']
+          config.search_params = options['params'] if options['params']
+
+          config.max = options['max'] if options['max']
+          if config.max < 3
+            STDERR.puts('Minimal value of max is: 3')
+            config.max = 3
+          end
         end
       end
 

data/lib/flickrage/entity/image_list.rb

@@ -43,6 +43,10 @@ module Flickrage
         total == Flickrage.config.max
       end
 
+      def estimate
+        Flickrage.config.max - total
+      end
+
       def merge_not_founds(new_not_founds)
         @not_founds = not_founds + new_not_founds
         self

data/lib/flickrage/service/downloader.rb

@@ -24,9 +24,8 @@ module Flickrage
           file.flock(File::LOCK_EX)
           parse_file(uri, file)
         end
-      rescue => e
+      ensure
         FileUtils.rm_f(path) if File.size(path).zero?
-        raise e
       end
 
       def parse_file(uri, file, limit = Flickrage.config.download_timeout)
@@ -56,16 +55,12 @@ module Flickrage
       end
 
       def file_name(uri)
-         "#{nsec}_" + File.basename(uri.path)
+        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,10 +4,13 @@ module Flickrage
     class Search
       include Flickrage::Helpers::Log
 
-      attr_reader :tagged_search
+      FLICKR_SIZES = %w(l o c z m)
+
+      attr_reader :tagged_search, :search_params
 
       def initialize
         @tagged_search = Flickrage.config.tagged_search
+        @search_params = Flickrage.config.search_params
       end
 
       def run(keyword)
@@ -24,15 +27,16 @@ module Flickrage
       private
 
       def image(result, keyword)
-        return unless result.respond_to?(:url_l)
+        size = get_image_size(result)
+        return unless size
 
         Flickrage::Entity::Image.new(
           id:      result.id,
           title:   title(result.title),
           keyword: keyword,
-          url:     result.url_l,
-          width:   result.width_l,
-          height:  result.height_l,
+          url:     result.send(:"url_#{size}"),
+          width:   result.send(:"width_#{size}"),
+          height:  result.send(:"height_#{size}"),
         )
       end
 
@@ -45,22 +49,23 @@ module Flickrage
         text[0..50] + '...'
       end
 
+      def get_image_size(result)
+        FLICKR_SIZES.detect { |t| result.respond_to?(:"url_#{t}") }
+      end
+
       def params(opts = {})
         {
-          content_type: '1',
-          extras: 'url_l',
+          extras: 'url_m, url_z, url_c, url_l, url_o',
           sort: 'interestingness-desc',
           per_page: 1,
-          pages: 1
-        }.merge(opts)
+          pages: 1,
+          media: 'photos',
+          accuracy: 1
+        }.merge(opts).merge(search_params)
       end
 
       def search_query(keyword)
-        if tagged_search
-          {tags: [keyword]}
-        else
-          {text: keyword}
-        end
+        tagged_search ? {tags: [keyword]} : {text: keyword}
       end
     end
   end

data/lib/flickrage/version.rb

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

data/lib/flickrage/worker/resize.rb

@@ -3,7 +3,7 @@ module Flickrage
   module Worker
     class Resize < Base
       MIN_IMAGE_SIZE = 100
-      MAX_IMAGE_SIZE = 500
+      MAX_IMAGE_SIZE = 1000
 
       def call(image_list)
         raise Flickrage::ResizeError, 'Not enough images for resize' if image_list.downloaded&.size < 1

data/lib/flickrage/worker/search.rb

@@ -7,12 +7,14 @@ module Flickrage
       def call
         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(', ')
-
         speaker.add_padding
         logger.debug('Searching process')
-        logger.info("Received keywords: [#{keys}]")
+        logger.info("Received keywords: [#{keywords.join(', ')}]")
+
+        keywords += sample_words(Flickrage.config.max - keywords.size)
+        keys = keywords.join(', ')
+
+        logger.info("Extended keywords: [#{keys}]")
 
         @spin = spinner(message: 'Searching ')
 
@@ -21,8 +23,8 @@ module Flickrage
         if image_list.valid?
           spin.success
         else
-          spin.error('(nothing found)')
-          raise Flickrage::SearchError
+          spin.error('(not enough images or nothing found)')
+          raise Flickrage::SearchError, 'Image list is not valid'
         end
 
         speaker.add_padding
@@ -55,15 +57,15 @@ module Flickrage
       end
 
       def service
-        @service ||= Service::Search.new
+        @service ||= Service::Search
       end
 
       def finder(keywords, spin, image_list = nil)
-        files = keywords.map do |k|
+        images = keywords.map do |k|
           Concurrent
             .future(thread_pool) do
               update_spin(spin, title: "Searching (keyword: #{k})")
-              service.run(k)
+              service.new.run(k)
             end
             .then do |r|
               update_spin(spin, title: "Searching (found image ID##{r.id})") if r
@@ -72,7 +74,7 @@ module Flickrage
             .rescue { |_| nil }
         end
 
-        result = Concurrent.zip(*files).value
+        result = Concurrent.zip(*images).value
         result = result.compact.flatten if result
 
         if image_list
@@ -90,7 +92,7 @@ module Flickrage
         not_founds = keywords - success_keywords
         image_list.merge_not_founds(not_founds)
 
-        keywords = sample_words_strict(not_founds&.size || 0, except: image_list.not_founds)
+        keywords = sample_words_strict(image_list.estimate, except: image_list.not_founds)
         return image_list if keywords.size.zero?
 
         finder(keywords, spin, image_list)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flickrage
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Alexander Merkulov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor