tumblr_draftking 0.8.5 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6b5f77dda0c0d3fc5e5bf4c4aeaff660dd6f94e
-  data.tar.gz: 4b59cd291c87baaaaef3e9d26f1a15a8015b0a71
+  metadata.gz: 049132366daff875b43a74dfdbd429cf778baeb7
+  data.tar.gz: e40794d1bdcb8d41a22627d75d682d370337ebcc
 SHA512:
-  metadata.gz: 5179163cc06b43b23434a6d823931d3015e2d05a54228a52f7e93865347942b711c2e20bc53b96000ef54dc7c5711b3bd19ca4b07ea75970010726e94c8c7e54
-  data.tar.gz: 192a53ce61efd8e3180198530fc1cc8f1dc14869869677b255f13736a86ec82614c4d4eaf6d49cc90a5353a4588148bb7c41c6cb1da5ca058caf487c9124cd96
+  metadata.gz: a47bbd200d6283ffad17da8322a05f514d7814bd17d1d3891459f1121859919e29d338dc6ffb150f352b5e04675bdb0a9f1485207087c22d6ea3af199c7c939c
+  data.tar.gz: 876764909b4983d5078ad0a620cf1698bf1ead4df28068148a36ab193c9ff2abb926a870de2d63bdf23199a01adab315db2648547c8bf930f70be86650d7652f

data/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog :: tumblr_draftking
+## Version 0.9.0
++ New! Batch upload and comment photos from a file.
+
 ## Version 0.8.5
 + Stability improvement for post retrieval routine
 

data/README.md

@@ -6,7 +6,8 @@ DraftKing is not associated with Tumblr
 [![Test Coverage](https://codeclimate.com/github/meissadia/tumblr_draftking/badges/coverage.svg)](https://codeclimate.com/github/meissadia/tumblr_draftking/coverage)
 
 DraftKing for Tumblr takes the hassle out of managing your draft queue!  
-+ **(New!) [Auto-Poster](#auto-poster): Publish up to 200 posts a day!**
++ **(New!) [Batch Uploader](#batch-uploader): Upload a list of URLs/files**
++ **[Auto-Poster](#auto-poster): Publish up to 200 posts a day!**
 + **Save and name your own [DK commands](#custom-commands)!**
 + **Automate the addition of comments and tags.**
 + **Strip away old comments.**
@@ -14,8 +15,8 @@ DraftKing for Tumblr takes the hassle out of managing your draft queue!
 + **Randomize post order to add variety.**
 + **Manage multiple accounts.**
 
-Version 0.8.5
-+ Stability improvement for post retrieval routine
+Version 0.9.0
++ New! Batch upload and comment photos from a file.
 
 + Please report any [issues] you encounter!
 + [Change Log](./CHANGELOG.md)
@@ -38,6 +39,7 @@ Version 0.8.5
 			+ [Stripping Comments](#stripping-comments)
 			+ [Comment & Move](#comment-&-move)
 			+ [Auto-Poster](#auto-poster)
+			+ [Batch Uploader](#batch-uploader)
 		+ [Testing Console](#testing-console)
 	+ [API](#api)
 + [Built With](#built-with)
@@ -232,6 +234,16 @@ $ dk md -c "draftking for tumblr" -k -t new,tags,to,add -m
 
 ```ruby
 $ dk ap -b 'test-blog' -c 'draftking auto poster' -k -t 'new,tags,to,add' -s :drafts
+```  
+
+##### Batch Uploader
+- Provide input file (-f FILE_PATH)
+- Upload to secondary blog (-b BLOG_NAME)
+- Provide a url to visit when photo is clicked (-l LINK_URL)
+- Add tags #blog2, #my upload (-t)
+
+```ruby
+$ dk ups -f /Users/meis/Desktop/new_stuff.txt -b blog2 -l blog2.tumblr.com -t 'blog2, my upload,'
 ```
 
 #### Testing Console

data/lib/draftking/cli/cli_helpers.rb

@@ -59,5 +59,9 @@ module DK
         end
       end
     end
+
+    def current_date_string
+      Time.now.strftime('%b %d, %H:%M:%S')
+    end
   end
 end

data/lib/draftking/cli/cli_options.rb

@@ -6,7 +6,7 @@ module DK
       d = {}
       d[:add_tags]      = 'Comma separated string of tags to add.'
       d[:blog]          = 'Name of blog to use. Excluding this will default to main blog.'
-      d[:comment]       = 'Comment to add to any posts which do not already contain it.'
+      d[:comment]       = 'A caption that gets added to your posts.'
       d[:config]        = 'Name or # of Config to use (`dk accounts` for list)'
       d[:credit]        = 'Give draftking credit with a tag'
       d[:keep_comments] = 'Keep the previous comments on a post.'
@@ -20,6 +20,8 @@ module DK
       d[:state]         = 'Set post state: d-draft, q-queued'
       d[:tags]          = 'Auto-Generate tags based on user comment.'
       d[:greedy]        = 'Select entire queue before processing the action.'
+      d[:file]          = 'File path.'
+      d[:link]          = 'URL to visit when photo is clicked.'
       d
     end
 

data/lib/draftking/cli/commands/uploads.rb

@@ -0,0 +1,135 @@
+module DK
+  class CLI < Thor
+    desc 'uploads, ups', 'Batch upload photos from url list.'
+    long_desc <<-LONGDESC
+    `uploads` will create Drafts from a list of photo urls.
+
+    *** Input File Format ***
+
+    Line type indicators:
+      -   (Start of a new caption group)
+      #   (Ignore this line during processing)
+
+    Example File:
+
+    -
+    Group 1 post caption
+    http://example.com/picture1.jpg
+    http://example.com/picture2.jpg
+    #this line is commented out
+    #http://example.com/bad_url.png
+    /path/to/file/group1/group1_pic.png
+    -
+    # this group has no caption
+    http://example.com/picture3.jpg
+    http://example.com/picture4.jpg
+    /path/to/file/picture5.png
+
+
+    LONGDESC
+    option :file,     type: :string,  aliases: :f, desc: Options.op_strings[:file], required: true
+    option :link,     type: :string,  aliases: :l, desc: Options.op_strings[:link]
+    option :blog,     type: :string,  aliases: :b, desc: Options.op_strings[:blog]
+    option :simulate, type: :boolean, aliases: :s, desc: Options.op_strings[:simulate]
+    option :mute,     type: :boolean, aliases: :m, desc: Options.op_strings[:mute]
+    option :add_tags, type: :string,  aliases: :t, desc: Options.op_strings[:add_tags]
+    option :config,   type: :string,  desc: Options.op_strings[:config]
+    def uploads
+      configured?
+      opts   = process_options(options)
+      dk     = get_dk_instance(opts)
+      dfile  = opts[:file].chomp.strip
+
+      File.open(dfile, 'r') do |data_file|
+        mod = 0
+        rows = []
+        caption = ''
+        row   = Struct.new(:count, :line, :file, :caption, :status)
+        title = ups_title(dfile, dk)
+        data_file.each_line.with_index do |line, idx|
+          line = line.chomp.strip
+          next if line.empty? || is_commented?(line)
+          (caption = nil) || next if is_url_group?(line)
+          (caption = line) && next if is_caption?(line, caption)
+          ups_progress(mod, caption) unless dk.mute
+          post_opts = ups_opts(line, caption, dk, opts)
+          status    = ups_photo_draft(dk, post_opts)
+          rows << row.new(mod += 1, idx + 1, File.basename(line), caption, status)
+        end # each_line
+        ups_report(title, dk, rows)
+      end # of data_file
+    end # of uploads
+
+    map 'ups' => :uploads # command alias
+
+    private
+
+    def is_url_group?(line)
+      line.start_with?('-')
+    end
+
+    def is_caption?(line, caption)
+      caption.nil? && (!is_file?(line) || !is_url?(line))
+    end
+
+    def is_commented?(line)
+      line.start_with? '#'
+    end
+
+    def is_file?(line)
+      line.start_with?('/')
+    end
+
+    def is_url?(line)
+      line.start_with?('http')
+    end
+
+    def ups_photo_draft(dk, post_opts)
+      result = { 'id' => 'success' }
+      result = dk.client.photo(dk.blog_name, post_opts) unless dk.simulate
+      result['id'] ? '√' : result['errors'].first
+    end
+
+    def ups_opts(line, caption, dk, opts)
+      post_opts = {
+        caption: caption,
+        state: dk.state,
+        tags: comment_to_tags(caption)
+      }
+      is_url?(line) ? (post_opts[:source] = line) : (post_opts[:data] = [line])
+      post_opts[:tags] += ",#{dk.tags}" unless dk.tags.nil?
+      post_opts[:link]  = opts[:link]   unless opts[:link].nil?
+      post_opts
+    end
+
+    def ups_report(title, dk, rows)
+      r = DK::Reporter.new(
+        title: title,
+        fields: DK::UPLOAD_FIELDS,
+        simulate: dk.simulate,
+        objects: rows
+      )
+      print ' ' * 80 + "\r\n" # erase_line
+      puts "\n#{r}\n" unless dk.mute
+    end
+
+    def ups_title(file, dk)
+      "DK Batch Uploader\n" \
+        "Input: #{file}\n" \
+        "Target: #{dk.blog_name} [ #{dk.state.capitalize} ]\n" \
+        "#{current_date_string}"
+    end
+
+    def ups_progress(mod, caption)
+      msg = "Current group: #{caption} • "
+      show_progress(current: mod, total: mod, message: msg)
+    end
+
+    def comment_to_tags(comment)
+      comment += " | #{DK::CREDIT_TAG}"
+      comment.slice!('bc / ')            # Remove prefix
+      comment.gsub(%r{[\/\\|]}, ',')     # Convert Separators
+             .gsub(' , ', ',')           # Clean up tags
+    end
+  end # of CLI
+end # of DK

data/lib/draftking/cli.rb

@@ -12,6 +12,7 @@ require_relative 'cli/commands/movedrafts'
 require_relative 'cli/commands/strip'
 require_relative 'cli/commands/status'
 require_relative 'cli/commands/tag'
+require_relative 'cli/commands/uploads'
 
 # Stored User Commands
 require_relative 'cli/commands/user_command'

data/lib/draftking/client.rb

@@ -14,7 +14,7 @@ module DK
     attr_accessor :shuffle,  :keep_tree, :test_data, :mute
     attr_accessor :simulate, :keep_tags, :before_id, :credit
     attr_accessor :message,  :source,    :auto_tag,  :state
-    attr_accessor :type
+    attr_accessor :type,     :tags
 
     # Initialize instance of DraftKing for the specified blog
     # @param options[:blog_name] [String] Target blog name

data/lib/draftking/constants.rb

@@ -22,5 +22,8 @@ module DK
   # PostReporter
   REPORT_TITLE  = 'Post Report'.freeze
   REPORT_FIELDS = %w(id state comment tags).freeze
-  REPORT_SIM    = ' (SIMULATION)'.freeze
+  REPORT_SIM    = '(SIMULATION)'.freeze
+
+  # Uploads
+  UPLOAD_FIELDS = %w(count line file caption status).freeze
 end

data/lib/draftking/drafts.rb

@@ -34,7 +34,7 @@ module DK
       options[:message] = 'Moving Drafts -> Queue: '
       options[:shuffle] = true
       options[:state]   = DK::QUEUE
-      options[:limit] ||= options[:greedy] ? nil : @q_space
+      options[:limit]   = options[:greedy] ? (nil || options[:limit]) : @q_space
       post_operation(options) do |post, index|
         next false unless index_within_limit?(index, @q_space)
         next false unless post.has_key_text?(@key_text)

data/lib/draftking/queue.rb

@@ -8,6 +8,7 @@ module DK
       options[:message] = 'Moving Queue ~> Drafts: '
       options[:shuffle] = false
       options[:state]   = DK::DRAFT
+      options[:source] ||= DK::QUEUE
       post_operation(options) do |post, _|
         post.changed = !post.has_key_text?(@key_text)
         post.change_state(@state) if post.changed

data/lib/draftking/reporter.rb

@@ -16,7 +16,7 @@ module DK
     # @param opts[:simulate] [Boolean] Show simulation indicator
     # @param opts[:title] [String] Report Title
     def build_title(opts)
-      "#{opts[:title]}#{REPORT_SIM if opts[:simulate]}"
+      "#{opts[:title]}#{"\n" + REPORT_SIM if opts[:simulate]}"
     end
 
     # Determine Field List

data/lib/draftking/version.rb

@@ -1,3 +1,3 @@
 module DK
-  VERSION = '0.8.5'.freeze
+  VERSION = '0.9.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tumblr_draftking
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.9.0
 platform: ruby
 authors:
 - Meissa Dia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-29 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tumblr_client
@@ -124,6 +124,7 @@ files:
 - lib/draftking/cli/commands/status.rb
 - lib/draftking/cli/commands/strip.rb
 - lib/draftking/cli/commands/tag.rb
+- lib/draftking/cli/commands/uploads.rb
 - lib/draftking/cli/commands/user_command.rb
 - lib/draftking/client.rb
 - lib/draftking/config.rb