twterm 1.0.9 → 1.0.10

data/lib/twterm/tab/statuses_tab.rb

@@ -2,7 +2,73 @@ module Twterm
   module Tab
     module StatusesTab
       include Base
-      include Scrollable
+
+      def append(status)
+        fail ArgumentError,
+          'argument must be an instance of Status class' unless status.is_a? Status
+
+        return if @status_ids.include?(status.id)
+
+        @status_ids.unshift(status.id)
+        status.split(window.maxx - 4)
+        status.touch!
+        scroll_manager.item_appended!
+        refresh
+      end
+
+      def count
+        grep_query.empty? ? @status_ids.count : statuses.count
+      end
+
+      def delete(status_id)
+        @status_ids.delete(status_id)
+        refresh
+      end
+
+      def destroy_status
+        status = highlighted_status
+
+        Client.current.destroy_status(status) do
+          delete(status.id)
+          refresh
+        end
+      end
+
+      def favorite
+        return if highlighted_status.nil?
+
+        method_name = highlighted_status.favorited ? :unfavorite : :favorite
+        Client.current.method(method_name).call(highlighted_status) { refresh }
+      end
+
+      def fetch
+        fail NotImplementedError, 'fetch method must be implemented'
+      end
+
+      def grep
+        reset_grep
+
+        Curses.echo
+        Curses.setpos(stdscr.maxy - 1, 0)
+        Curses.stdscr.addch '/'
+        @grep_query = Curses.getstr.chomp
+        Curses.noecho
+
+        if grep_query.empty?
+          reset_grep
+        elsif count == 0
+          Notifier.instance.show_error "No matches found: \"#{grep_query}\""
+          reset_grep
+        else
+          Notifier.instance.show_message "#{count} statuses found: \"#{grep_query}\""
+          scroll_manager.move_to_top
+          refresh
+        end
+      end
+
+      def grep_query
+        @grep_query || ''
+      end
 
       def initialize
         super
@@ -10,10 +76,12 @@ module Twterm
         @status_ids = []
       end
 
-      def statuses
-        statuses = @status_ids.map { |id| Status.find(id) }.reject(&:nil?)
-        @status_ids = statuses.map(&:id)
-        statuses
+      def open_link
+        return if highlighted_status.nil?
+
+        status = highlighted_status
+        urls = status.urls.map(&:expanded_url) + status.media.map(&:expanded_url)
+        urls.each(&Launchy.method(:open))
       end
 
       def prepend(status)
@@ -22,21 +90,9 @@ module Twterm
         return if @status_ids.include?(status.id)
 
         @status_ids << status.id
-        status.split(@window.maxx - 4)
-        status.touch!
-        item_prepended
-        refresh
-      end
-
-      def append(status)
-        fail ArgumentError, 'argument must be an instance of Status class' unless status.is_a? Status
-
-        return if @status_ids.include?(status.id)
-
-        @status_ids.unshift(status.id)
-        status.split(@window.maxx - 4)
+        status.split(window.maxx - 4)
         status.touch!
-        item_appended
+        scroll_manager.item_prepended!
         refresh
       end
 
@@ -45,17 +101,53 @@ module Twterm
         Tweetbox.instance.compose(highlighted_status)
       end
 
-      def favorite
-        return if highlighted_status.nil?
-        if highlighted_status.favorited?
-          Client.current.unfavorite(highlighted_status) do
-            refresh
-          end
+      def reset_grep
+        # TODO: replace with more general way (issue #170)
+        stdscr.clear
+        Screen.instance.refresh
+
+        @grep_query = ''
+        refresh
+      end
+
+      def respond_to_key(key)
+        case key
+        when ?c
+          show_conversation
+        when ?d, 4
+          10.times { scroll_manager.move_down }
+        when ?D
+          destroy_status
+        when ?F
+          favorite
+        when ?g
+          scroll_manager.move_to_top
+        when ?G
+          scroll_manager.move_to_bottom
+        when ?j, 14, Curses::Key::DOWN
+          scroll_manager.move_down
+        when ?k, 16, Curses::Key::UP
+          scroll_manager.move_up
+        when ?o
+          open_link
+        when ?r
+          reply
+        when ?R
+          retweet
+        when 18
+          fetch
+        when ?u, 21
+          10.times { scroll_manager.move_up }
+        when ?U
+          show_user
+        when ?/
+          grep
+        when ?q
+          reset_grep
         else
-          Client.current.favorite(highlighted_status) do
-            refresh
-          end
+          return false
         end
+        true
       end
 
       def retweet
@@ -65,18 +157,10 @@ module Twterm
         end
       end
 
-      def destroy_status
-        status = highlighted_status
-
-        Client.current.destroy_status(status) do
-          delete(status.id)
-          refresh
-        end
-      end
-
-      def delete(status_id)
-        @status_ids.delete(status_id)
-        refresh
+      def show_conversation
+        return if highlighted_status.nil?
+        tab = Tab::ConversationTab.new(highlighted_status.id)
+        TabManager.instance.add_and_show(tab)
       end
 
       def show_user
@@ -86,21 +170,15 @@ module Twterm
         TabManager.instance.add_and_show(user_tab)
       end
 
-      def open_link
-        return if highlighted_status.nil?
-        status = highlighted_status
-        urls = status.urls.map(&:expanded_url) + status.media.map(&:expanded_url)
-        urls.each(&Launchy.method(:open))
-      end
-
-      def show_conversation
-        return if highlighted_status.nil?
-        tab = Tab::ConversationTab.new(highlighted_status.id)
-        TabManager.instance.add_and_show(tab)
-      end
+      def statuses
+        statuses = @status_ids.map { |id| Status.find(id) }.reject(&:nil?)
+        @status_ids = statuses.map(&:id)
 
-      def fetch
-        fail NotImplementedError, 'fetch method must be implemented'
+        if grep_query.empty?
+          statuses
+        else
+          statuses.select { |s| s.grepped_with?(grep_query) }
+        end
       end
 
       def touch_statuses
@@ -110,136 +188,102 @@ module Twterm
       def update
         current_line = 0
 
-        @window.clear
+        offset = scroll_manager.offset
+        index = scroll_manager.index
 
         return if offset < 0
 
         statuses.reverse.drop(offset).each.with_index(offset) do |status, i|
-          formatted_lines = status.split(@window.maxx - 4).count
-          if current_line + formatted_lines + 2 > @window.maxy
-            @scrollable_last = i
+          formatted_lines = status.split(window.maxx - 4).count
+          if current_line + formatted_lines + 2 > window.maxy
+            scroll_manager.last = i
             break
           end
 
           posy = current_line
 
           if index == i
-            @window.with_color(:black, :magenta) do
+            window.with_color(:black, :magenta) do
               (formatted_lines + 1).times do |j|
-                @window.setpos(posy + j, 0)
-                @window.addch(' ')
+                window.setpos(posy + j, 0)
+                window.addch(' ')
               end
             end
           end
 
-          @window.setpos(current_line, 2)
+          window.setpos(current_line, 2)
 
-          @window.bold do
-            @window.with_color(status.user.color) do
-              @window.addstr(status.user.name)
+          window.bold do
+            window.with_color(status.user.color) do
+              window.addstr(status.user.name)
             end
           end
 
-          @window.addstr(" (@#{status.user.screen_name}) [#{status.date}] ")
+          window.addstr(" (@#{status.user.screen_name}) [#{status.date}] ")
 
           unless status.retweeted_by.nil?
-            @window.addstr('(retweeted by ')
-            @window.bold do
-              @window.addstr("@#{status.retweeted_by.screen_name}")
+            window.addstr('(retweeted by ')
+            window.bold do
+              window.addstr("@#{status.retweeted_by.screen_name}")
             end
-            @window.addstr(') ')
+            window.addstr(') ')
           end
 
           if status.favorited?
-            @window.with_color(:black, :yellow) do
-              @window.addch(' ')
+            window.with_color(:black, :yellow) do
+              window.addch(' ')
             end
 
-            @window.addch(' ')
+            window.addch(' ')
           end
 
           if status.retweeted?
-            @window.with_color(:black, :green) do
-              @window.addch(' ')
+            window.with_color(:black, :green) do
+              window.addch(' ')
             end
-            @window.addch(' ')
+            window.addch(' ')
           end
 
           if status.favorite_count > 0
-            @window.with_color(:yellow) do
-              @window.addstr("#{status.favorite_count}fav#{status.favorite_count > 1 ? 's' : ''}")
+            window.with_color(:yellow) do
+              window.addstr("#{status.favorite_count}fav#{status.favorite_count > 1 ? 's' : ''}")
             end
-            @window.addch(' ')
+            window.addch(' ')
           end
 
           if status.retweet_count > 0
-            @window.with_color(:green) do
-              @window.addstr("#{status.retweet_count}RT#{status.retweet_count > 1 ? 's' : ''}")
+            window.with_color(:green) do
+              window.addstr("#{status.retweet_count}RT#{status.retweet_count > 1 ? 's' : ''}")
             end
-            @window.addch(' ')
+            window.addch(' ')
           end
 
-          status.split(@window.maxx - 4).each do |line|
+          status.split(window.maxx - 4).each do |line|
             current_line += 1
-            @window.setpos(current_line, 2)
-            @window.addstr(line)
+            window.setpos(current_line, 2)
+            window.addstr(line)
           end
 
           current_line += 2
         end
 
-        draw_scroll_bar
-
-        @window.refresh
-
         UserWindow.instance.update(highlighted_status.user) unless highlighted_status.nil?
-        show_help
-      end
-
-      def respond_to_key(key)
-        return true if super
-
-        case key
-        when 'c'
-          show_conversation
-        when 'D'
-          destroy_status
-        when 'F'
-          favorite
-        when 'o'
-          open_link
-        when 'r'
-          reply
-        when 'R'
-          retweet
-        when 18
-          fetch
-        when 'U'
-          show_user
-        else
-          return false
-        end
-        true
       end
 
       private
 
       def highlighted_status
-        id = @status_ids[count - index - 1]
+        id = @status_ids[scroll_manager.count - scroll_manager.index - 1]
         Status.find(id)
       end
 
-      def count
-        @status_ids.count
-      end
-
       def offset_from_bottom
         return @offset_from_bottom unless @offset_from_bottom.nil?
 
         height = 0
         statuses.each.with_index(-1) do |status, i|
-          height += status.split(@window.maxx - 4).count + 2
-          if height >= @window.maxy
+          height += status.split(window.maxx - 4).count + 2
+          if height >= window.maxy
             @offset_from_bottom = i
             return i
           end
@@ -247,13 +291,18 @@ module Twterm
         count
       end
 
-      def sort
-        @status_ids &= Status.all.map(&:id)
-        @status_ids.sort_by! { |id| Status.find(id).created_at_for_sort }
+      def scroll_manager
+        return @scroll_manager unless @scroll_manager.nil?
+
+        @scroll_manager = ScrollManager.new
+        @scroll_manager.delegate = self
+        @scroll_manager.after_move { refresh }
+        @scroll_manager
       end
 
-      def show_help
-        Notifier.instance.show_help '[n] Compose  [r] Reply  [F] Favorite  [R] Retweet  [U] Show user  [w] Close tab  [Q] Quit'
+      def sort
+        @status_ids &= Status.all.map(&:id)
+        @status_ids.sort_by! { |id| Status.find(id).appeared_at }
       end
     end
   end

data/lib/twterm/tab/timeline_tab.rb

@@ -3,6 +3,18 @@ module Twterm
     class TimelineTab
       include StatusesTab
 
+      def close
+        fail NotClosableError
+      end
+
+      def fetch
+        @client.home_timeline do |statuses|
+          statuses.each(&method(:prepend))
+          sort
+          yield if block_given?
+        end
+      end
+
       def initialize(client)
         fail ArgumentError, 'argument must be an instance of Client class' unless client.is_a? Client
 
@@ -11,23 +23,9 @@ module Twterm
         @client.on_timeline_status(&method(:prepend))
         @title = 'Timeline'
 
-        fetch { move_to_top }
+        fetch { scroll_manager.move_to_top }
         @auto_reloader = Scheduler.new(180) { fetch }
       end
-
-      def fetch
-        Thread.new do
-          @client.home_timeline do |statuses|
-            statuses.each(&method(:prepend))
-            sort
-            yield if block_given?
-          end
-        end
-      end
-
-      def close
-        fail NotClosableError
-      end
     end
   end
 end

data/lib/twterm/tab/user_tab.rb

@@ -6,17 +6,17 @@ module Twterm
 
       attr_reader :user
 
-      def initialize(user_id)
-        super()
+      def ==(other)
+        other.is_a?(self.class) && user == other.user
+      end
 
-        User.find_or_fetch(user_id) do |user|
-          @user = user
-          @title = "@#{@user.screen_name}"
-          TabManager.instance.refresh_window
+      def close
+        @auto_reloader.kill if @auto_reloader
+        super
+      end
 
-          fetch { move_to_top }
-          @auto_reloader = Scheduler.new(120) { fetch }
-        end
+      def dump
+        @user.id
       end
 
       def fetch
@@ -27,17 +27,17 @@ module Twterm
         end
       end
 
-      def close
-        @auto_reloader.kill if @auto_reloader
-        super
-      end
+      def initialize(user_id)
+        super()
 
-      def ==(other)
-        other.is_a?(self.class) && user == other.user
-      end
+        User.find_or_fetch(user_id) do |user|
+          @user = user
+          @title = "@#{@user.screen_name}"
+          TabManager.instance.refresh_window
 
-      def dump
-        @user.id
+          fetch { scroll_manager.move_to_top }
+          @auto_reloader = Scheduler.new(120) { fetch }
+        end
       end
     end
   end

data/lib/twterm/tab_manager.rb

@@ -5,16 +5,9 @@ module Twterm
 
     DUMPED_TABS_FILE = "#{ENV['HOME']}/.twterm/dumped_tabs"
 
-    def initialize
-      @tabs = []
-      @index = 0
-      @history = []
-
-      @window = stdscr.subwin(3, stdscr.maxx - 30, 0, 0)
-    end
-
     def add(tab_to_add)
       fail ArgumentError, 'argument must be an instance of Tab::Base' unless tab_to_add.is_a? Tab::Base
+
       @tabs.each.with_index do |tab, i|
         next unless tab == tab_to_add
         @index = i
@@ -35,28 +28,6 @@ module Twterm
       result
     end
 
-    def current_tab
-      @history.unshift(@index).uniq!
-      @tabs[@index]
-    end
-
-    def show_next
-      @index = (@index + 1) % @tabs.count
-      current_tab.refresh
-      refresh_window
-    end
-
-    def show_previous
-      @index = (@index - 1) % @tabs.count
-      current_tab.refresh
-      refresh_window
-    end
-
-    def open_new
-      tab = Tab::New::Start.new
-      add_and_show(tab)
-    end
-
     def close
       current_tab.close
       @tabs.delete_at(@index)
@@ -69,9 +40,19 @@ module Twterm
       Notifier.instance.show_error 'This tab cannot be closed'
     end
 
-    def switch(tab)
-      close
-      add_and_show(tab)
+    def current_tab
+      @history.unshift(@index).uniq!
+      @tabs[@index]
+    end
+
+    def dump_tabs
+      data = @tabs.each_with_object([]) do |tab, arr|
+        next unless tab.is_a? Tab::Dumpable
+        arr << [tab.class, tab.title, tab.dump]
+      end
+      File.open(DUMPED_TABS_FILE, 'w', 0600) do |f|
+        f.write data.to_yaml
+      end
     end
 
     def each_tab(&block)
@@ -80,8 +61,25 @@ module Twterm
       end
     end
 
+    def initialize
+      @tabs = []
+      @index = 0
+      @history = []
+
+      @window = stdscr.subwin(3, stdscr.maxx - 30, 0, 0)
+    end
+
+    def open_new
+      tab = Tab::New::Start.new
+      add_and_show(tab)
+    end
+
     def recover_tabs
-      return unless File.exist? DUMPED_TABS_FILE
+      unless File.exist? DUMPED_TABS_FILE
+        tab = Tab::KeyAssignmentsCheatsheet.new
+        add(tab)
+        return
+      end
 
       data = YAML.load(File.read(DUMPED_TABS_FILE))
       data.each do |klass, title, arg|
@@ -92,16 +90,6 @@ module Twterm
       Notifier.instance.show_error 'Failed to recover tabs'
     end
 
-    def dump_tabs
-      data = @tabs.each_with_object([]) do |tab, arr|
-        next unless tab.is_a? Tab::Dumpable
-        arr << [tab.class, tab.title, tab.dump]
-      end
-      File.open(DUMPED_TABS_FILE, 'w', 0600) do |f|
-        f.write data.to_yaml
-      end
-    end
-
     def refresh_window
       @window.clear
       current_tab_id = current_tab.object_id
@@ -137,5 +125,22 @@ module Twterm
       end
       true
     end
+
+    def show_next
+      @index = (@index + 1) % @tabs.count
+      current_tab.refresh
+      refresh_window
+    end
+
+    def show_previous
+      @index = (@index - 1) % @tabs.count
+      current_tab.refresh
+      refresh_window
+    end
+
+    def switch(tab)
+      close
+      add_and_show(tab)
+    end
   end
 end