doing-plugin-twitter-import 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9df02efee1e4b0d68c8fca88eafbeb138673d5028b32e0699ecd7721b02d060
-  data.tar.gz: a868f4d998d03c6631b0456c7dd111f251eb2d89a9b2e5404325a6179b5b7f36
+  metadata.gz: 4d88dbc6489815faa760dcf33b790394aad587b777bbebec01c4cd3526bd72df
+  data.tar.gz: 65e157b50060cd67f924069793a82be556822d21612d6e5d82992f8b1c69ccc5
 SHA512:
-  metadata.gz: 70a5b493b836db48bbd477212587880865096ba30168c828e959bca8d188a8487a453c6b3d5d66a904bb4b4c82820e1a8a1118f0e363046b1c1d6c1284881feb
-  data.tar.gz: 509cc0119a2099e9cd2f8b0f3a1afa94b608b59f4c8ef3889f6a1b5001082a2926a41122443f2f43e3ae6a3c5542b90f62966ed364cfa0e9b64cad8cd4bc0341
+  metadata.gz: 00e03f3fb165f7af7043f4b46a1918cf45930ce6c28f1b27f1bef5004aa72a3aeb17ca70f7690b2c13fb52a6bce6b805cde1db37a53f6edc2a10642b81467f70
+  data.tar.gz: fdb09090680c96ccd8fb533600e845d192fc785472f977cf0694164848b8e7e5cd244d669d6c8a3fef3317230b67a8e94a881bdd1f9038d9193f20ac9724fdf6

data/lib/doing-plugin-twitter-import.rb

@@ -31,7 +31,7 @@ module Doing
       key = Doing.setting('plugins.twitter.api_key')
       secret = Doing.setting('plugins.twitter.api_secret')
 
-      raise PluginException, 'Please add API key/secret to config' if key =~ /^xxxxx/
+      raise PluginException, 'Please add Twitter API key/secret to config. Run `doing config refresh` to add placeholders.' if key =~ /^xxxxx/
 
       user = Doing.setting('plugins.twitter.user')
 
@@ -49,7 +49,9 @@ module Doing
 
       @old_items = wwid.content
 
-      new_items = load_timeline(user)
+      new_items = load_timeline(user, wwid, { prefix: prefix, tags: tags, section: options[:section], autotag: options[:autotag] })
+
+      return if new_items.nil?
 
       total = new_items.count
 
@@ -65,24 +67,7 @@ module Doing
       new_items.each do |item|
         next if duplicate?(item)
 
-        title = "#{prefix} #{item.title} @done"
-        tags.each do |tag|
-          if title =~ /\b#{tag}\b/i
-            title.sub!(/\b#{tag}\b/i, "@#{tag}")
-          else
-            title += " @#{tag}"
-          end
-        end
-        title = wwid.autotag(title) if options[:autotag]
-        title.gsub!(/ +/, ' ')
-        title.strip!
-        section = options[:section] || item.section
-        section ||= wwid.config['current_section']
-
-        new_item = Item.new(item.date, title, section)
-        new_item.note = item.note
-
-        imported.push(new_item)
+        imported.push(item)
       end
 
       dups = new_items.count - imported.count
@@ -108,25 +93,67 @@ module Doing
       false
     end
 
-    def self.load_timeline(user)
-      tweets = @client.user_timeline(user, {
+    def self.load_timeline(user, wwid, options)
+      config_dir = File.join(Util.user_home, '.config', 'doing')
+      id_storage = File.join(config_dir, 'last_tweet_id')
+      Doing.logger.log_now(:info, 'Twitter:', "retrieving timeline for #{user}")
+
+      if File.exist?(id_storage)
+        last_id = IO.read(id_storage).strip.to_i
+      else
+        last_id = nil
+      end
+
+      tweet_options = {
         count: 200,
         include_rts: true,
         exclude_replies: true
-      }).map { |t| { date: t[:created_at], title: t[:text], id: t[:id] } }
+      }
+      tweet_options[:since_id] = last_id if last_id
+
+      tweets = @client.user_timeline(user, tweet_options).map do |t|
+        { date: t[:created_at], title: t[:text], id: t[:id] }
+      end
+      if !tweets.nil? && tweets.count.positive?
+        Doing.logger.log_now(:info, 'Twitter:', "found #{tweets.count} new tweets")
+      else
+        Doing.logger.log_now(:info, 'Twitter:', 'no new tweets found')
+        return
+      end
 
       items = []
 
-      tweets.each do |tweet|
-        date = tweet[:date]
+      tweets.reverse.each do |tweet|
+        last_id = tweet[:id] if tweet[:id]
+        date = Time.parse(tweet[:date].strftime('%Y-%m-%d %H:%M -0000')).localtime
         text = tweet[:title].dup
         text = text.force_encoding('utf-8') if text.respond_to? :force_encoding
         input = text.split("\n")
         title = input[0]
         note = Note.new(input.slice(1, input.count))
 
-        new_entry = Item.new(date, title, nil, note)
-        items << new_entry if new_entry
+        title = "#{options[:prefix]} #{title} @done"
+        options[:tags].each do |tag|
+          if title =~ /\b#{tag}\b/i
+            title.sub!(/\b#{tag}\b/i, "@#{tag}")
+          else
+            title += " @#{tag}"
+          end
+        end
+        title = wwid.autotag(title) if options[:autotag]
+        title.gsub!(/ +/, ' ')
+        title.strip!
+        section = options[:section] || wwid.config['current_section']
+
+        new_item = Item.new(date, title, section)
+        new_item.note = note
+
+        items << new_item if new_item
+      end
+
+      FileUtils.mkdir(config_dir) unless File.exist?(config_dir)
+      File.open(id_storage, 'w+') do |f|
+        f.puts last_id
       end
 
       items

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doing-plugin-twitter-import
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Brett Terpstra