bbiff 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd30ca75c040f69a2d133839bacf119a872c9061
-  data.tar.gz: 83e817bfd77e054edf0503945580e43534e87e61
+  metadata.gz: 037966c6b4adc37eb5630c02746d1c0a6ef609ed
+  data.tar.gz: 87886e10129ef9ae257a78c52396bc0e3324ab39
 SHA512:
-  metadata.gz: 3252f846fd7ccd4675456df483f400b962e98b5c9217a5d8e378c6468a7e62c8773a48ae600e23971622e08624351d1c5bccc7690d213e9024cec8e58f9a4c0b
-  data.tar.gz: cf3e620a32d8fa61be5f2453082591932ed234cdc948966375d51177090a8eb667f3215a94780ef6c616f214577b2748ebe449fc04e46b53de2abf3396d559b8
+  metadata.gz: 1116585b2aa1dd80258bf3e8d99bba5cac503790539faeb5e5fea99b6bfedb9ea1601b59f0b3e061264f758a0500e62ef8f611cc5a45fc99ac974703344f9c73
+  data.tar.gz: 7eb9d8a7d563b58cc52534604e7af91a2d40f416eb66bbe8ed5ac60cd3963030fd244d320c134e17da3c82b1b27a23aacafd0f7723f51c6e442598d89e7b3706

data/README.md

@@ -2,7 +2,8 @@
 
 ## 必要なもの
 
-notify-send コマンド
+デスクトップに通知ポップアップを表示する、notify-send コマンド。Ubuntu
+では以下のようにインストールできます。
 
     sudo apt-get install libnotify-bin
 
@@ -14,8 +15,10 @@ notify-send コマンド
 
 	bbiff スレッドのURL レス通知を始める番号
 
-スレッドのURLは http://jbbs.shitaraba.net/bbs/read.cgi/カテゴリ/板ID/スレID/
-の形式です。
+スレッドのURLはしたらば掲示板の場合、
+`http://jbbs.shitaraba.net/bbs/read.cgi/カテゴリ/板ID/スレID/`、2ちゃ
+んねる互換掲示板の場合は、`http://ホスト名/test/read.cgi/板名/スレID/`
+のような形式になります。
 
 単に
 
@@ -23,16 +26,11 @@ notify-send コマンド
 
 とすると、前回監視したスレッドを監視します。
 
-## 開発・TODO
-
-- .travis.ymlでテストするなら要編集
-- moduleの中にまとめるべきかも
-
 ## リリース
 
 ver 0.1.0
   * gem 化した。(DoG-peer さん)
-  
+
 ver 0.1.2
   * notify-send コマンドがインストールされていない場合は echo コマンド
     を利用するようにした。(raduwen さん)
@@ -53,6 +51,10 @@ ver 0.2.2
   * 最後に読み込んだスレの情報が無い状態で、引数なしで bbiff を起動し
     た時にエラーになっていたのを修正。
 
+ver 0.3.0
+  * 2ちゃんねる互換掲示板に対応したつもり。
+  * 日付の相対表示を辞めた。
+
 ## 作者
 
 予定地 <plonk@piano.email.ne.jp>

data/lib/bbiff/bbs_reader.rb

@@ -1,141 +1,414 @@
 require 'net/http'
 require 'uri'
+require 'pp' if $DEBUG
 
 module Bbs
 
-class C板
-  def initialize(カテゴリ, 掲示板番号)
-    @カテゴリ = カテゴリ
-    @掲示板番号 = 掲示板番号
-    @設定URL = URI.parse( "http://jbbs.shitaraba.net/bbs/api/setting.cgi/#{カテゴリ}/#{掲示板番号}/" )
-    @スレ一覧URL = URI.parse( "http://jbbs.shitaraba.net/#{カテゴリ}/#{掲示板番号}/subject.txt" )
-  end
+  class Post
+    class << self
+      def from_s(str)
+        Post.new(*str.split('<>', 5))
+      end
+    end
 
-  def dat_url(スレッド番号)
-    return URI.parse("http://jbbs.shitaraba.net/bbs/rawmode.cgi/#{@カテゴリ}/#{@掲示板番号}/#{スレッド番号}/")
-  end
+    attr_reader :no, :name, :mail, :body, :date
 
-  def 設定
-    r = ダウンロード(@設定URL)
-    return 設定をパーズする(r.force_encoding("EUC-JP").encode("UTF-8"))
-  end
+    def initialize(no, name, mail, date, body)
+      @no = no.to_i
+      @name = name
+      @mail = mail
+      @date = date
+      @body = body
+    end
 
-  def スレ一覧
-    r = ダウンロード(@スレ一覧URL)
-    return r.force_encoding("EUC-JP").encode("UTF-8")
-  end
+    # 削除された時のフィールドの値は、掲示板の設定によるなぁ。
+    # def deleted?
+    #   @date == '＜削除＞'
+    # end
 
-  def dat(スレッド番号)
-    url = dat_url(スレッド番号)
-    r = ダウンロード(url)
-    return r.force_encoding("EUC-JP").encode("UTF-8")
-  end
+    def to_s
+      [no, name, mail, date, body].join('<>')
+    end
 
-  def thread(スレッド番号)
-    threads.find { |t| t.id == スレッド番号 }
   end
 
-  def threads
-    スレ一覧.each_line.map do |line|
-      fail 'スレ一覧のフォーマットが変です' unless line =~ /^(\d+)\.cgi,(.+?)\((\d+)\)$/
-      id, title, last = $1.to_i, $2, $3.to_i
-      Thread.new(self, id, title, last)
+  class Downloader
+    class DownloadFailure < StandardError
+      attr_reader :response
+
+      def initialize(response)
+        @response = response
+      end
     end
-  end
 
-  def ダウンロード(url)
-    応答 = Net::HTTP.start(url.host, url.port) { |http|
-      http.get(url.path)
-    }
-    return 応答.body
-  end
+    class Resource
+      attr_reader :data
 
-  private
+      def initialize(data)
+        self.data = data
+      end
 
-  def 設定をパーズする(文字列)
-    文字列.each_line.map { |line|
-      line.chomp.split(/=/, 2)
-    }.to_h
-  end
-end
+      def data=(new_data)
+        type_check(new_data)
+        @data = new_data.dup.freeze
+      end
 
-class Post
-  attr_reader :no, :name, :mail, :body
+      private
 
-  def self.from_line(line)
-    no, name, mail, date, body, = line.split('<>', 6)
-    Post.new(no, name, mail, date, body)
-  end
+      # ASCII-8BIT エンコーディングの String に限定する。
+      def type_check(data)
+        unless data.is_a? String
+          raise TypeError, 'not a string'
+        end
+        unless data.encoding == Encoding::ASCII_8BIT
+          raise ArgumentError, "encoding not ASCII-8BIT (#{data.encoding})"
+        end
+      end
+    end
 
-  def initialize(no, name, mail, date, body)
-    @no = no.to_i
-    @name = name
-    @mail = mail
-    @date = date
-    @body = body
-  end
+    attr_reader :encoding
 
-  def date
-    str2time(@date)
-  end
+    def initialize(encoding = 'UTF-8')
+      @encoding = encoding
+      @resource_cache = {}
+    end
 
-  def to_s
-    [no, name, mail, @date, body, '', ''].join('<>')
-  end
+    # ASCII-8BIT エンコーディングの文字列を返す。
+    def download_binary(uri)
+      resource = @resource_cache[uri]
+      if resource
+        Net::HTTP.start(uri.host, uri.port) do |http|
+          request = Net::HTTP::Get.new(uri)
+          request['range'] = "bytes=#{resource.data.bytesize}-"
+          response = http.request(request)
+          response.body.force_encoding('ASCII-8BIT')
+          pp response.code if $DEBUG
+          pp response.to_hash if $DEBUG
+          case response
+          when Net::HTTPPartialContent
+            p :partial if $DEBUG
+            resource.data += response.body
+          when Net::HTTPRequestedRangeNotSatisfiable
+            p :not_satisfiable if $DEBUG
+            # 多分DATは更新されていない
+          when Net::HTTPOK
+            p :ok if $DEBUG
+            @resource_cache[uri] = Resource.new(response.body)
+            return response.body
+          else
+            raise DownloadFailure.new(response)
+          end
+          return resource.data
+        end
+      else
+        p :no_resource_yet if $DEBUG
+        body = download_binary_nocache(uri)
+        @resource_cache[uri] = Resource.new(body)
+        return body
+      end
+    end
 
-  private
+    def download_binary_nocache(uri)
+      response = nil
+      Net::HTTP.start(uri.host, uri.port) do |http|
+        request = Net::HTTP::Get.new(uri)
+        response = http.request(request)
+        response.body.force_encoding('ASCII-8BIT')
+        pp response.code if $DEBUG
+        pp response.to_hash if $DEBUG
+        case response
+        when Net::HTTPOK
+        else
+          raise DownloadFailure.new(response)
+        end
+      end
+      return response.body
+    end
 
-  def str2time(str)
-    if str =~ %r{^(\d{4})/(\d{2})/(\d{2})\(.\) (\d{2}):(\d{2}):(\d{2})$}
-      y, mon, d, h, min, sec = [$1, $2, $3, $4, $5, $6].map(&:to_i)
-      Time.new(y, mon, d, h, min, sec)
-    else
-      fail ArgumentError
+    def download_text(uri)
+      # dup は重要。
+      download_binary(uri).dup.force_encoding(encoding).encode('UTF-8')
     end
   end
-end
 
-class Thread
-  attr_reader :id, :title, :last, :board
+  class BoardBase
+    private_class_method :new
+    attr_reader :settings_url
 
-  def initialize(board, id, title, last = 1)
-    @board = board
-    @id = id
-    @title = title
-    @last = last
+    def initialize(text_encoding)
+      @downloader = Downloader.new(text_encoding)
+    end
+
+    def thread(thread_num)
+      threads.find { |t| t.id == thread_num }
+    end
+
+    def settings
+      return parse_settings(download_text(@settings_url))
+    end
+
+    def thread_list
+      return download_text(@thread_list_url)
+    end
+
+    def dat(thread_num)
+      return download_text(dat_url(thread_num))
+    end
+
+    def threads
+      thread_list.each_line.map do |line|
+        create_thread_from_line(line)
+      end
+    end
+
+    # 抽象メソッド
+    def create_thread_from_line(_line)
+      raise 'unimplemented'
+    end
+
+    def dat_url(_thread_num)
+      raise 'unimplemented'
+    end
+
+    protected
+
+    def download_binary(url)
+      @downloader.download_binary(url)
+    end
+
+    def download_text(url)
+      @downloader.download_text(url)
+    end
+
+    def parse_settings(string)
+      string.each_line.map { |line|
+        line.chomp.split(/=/, 2)
+      }.to_h
+    end
   end
 
-  def dat_url
-    @board.dat_url(@id)
+  class ThreadBase
+    private_class_method :new
+    attr_reader :board, :id, :title, :last
+
+    def initialize(board, id, title, last)
+      @board = board
+      @id = id
+      @title = title
+      @last = last
+    end
+
+    def dat_url
+      @board.dat_url(@id)
+    end
+
   end
 
-  def posts(range)
-    fail ArgumentError unless range.is_a? Range
-    dat_for_range(range).each_line.map do |line|
-      Post.from_line(line.chomp).tap do |post|
-        # ついでに last を更新
-        @last = [post.no, last].max
+  module Shitaraba
+    SHITARABA_THREAD_URL_PATTERN = %r{\Ahttp://jbbs\.shitaraba\.net/bbs/read\.cgi/(\w+)/(\d+)/(\d+)(:?|\/.*)\z}
+    SHITARABA_BOARD_TOP_URL_PATTERN = %r{\Ahttp://jbbs\.shitaraba\.net/(\w+)/(\d+)/?\z}
+
+    # したらば板
+    class Board < Bbs::BoardBase
+      class << self
+        def from_url(url)
+          if url.to_s =~ SHITARABA_BOARD_TOP_URL_PATTERN
+            category, board_num = $1, $2.to_i
+            return Board.send(:new, category, board_num)
+          elsif url.to_s =~ SHITARABA_THREAD_URL_PATTERN
+            category, board_num, thread_num = $1, $2.to_i, $3.to_i
+            return Board.send(:new, category, board_num)
+          else
+            return nil
+          end
+        end
+      end
+
+      def initialize(category, board_num)
+        super('EUC-JP')
+        @category = category
+        @board_num = board_num
+        @settings_url = URI.parse( "http://jbbs.shitaraba.net/bbs/api/setting.cgi/#{category}/#{board_num}/" )
+        @thread_list_url = URI.parse( "http://jbbs.shitaraba.net/#{category}/#{board_num}/subject.txt" )
+      end
+
+      def dat_url(thread_num)
+        return URI.parse("http://jbbs.shitaraba.net/bbs/rawmode.cgi/#{@category}/#{@board_num}/#{thread_num}/")
+      end
+
+      def create_thread_from_line(line)
+        Thread.from_line(line, self)
+      end
+    end
+
+    # したらばスレッド
+    class Thread < Bbs::ThreadBase
+      class << self
+        def from_url(url)
+          if url.to_s =~ SHITARABA_THREAD_URL_PATTERN
+            category, board_num, thread_num = $1, $2.to_i, $3.to_i
+            board = Board.send(:new, category, board_num)
+            thread = board.thread(thread_num)
+            raise 'no such thread' if thread.nil?
+            return thread
+          else
+            return nil
+          end
+        end
+
+        def from_line(line, board)
+          unless line =~ /^(\d+)\.cgi,(.+?)\((\d+)\)$/
+            fail 'スレ一覧のフォーマットが変です'
+          end
+          id, title, last = $1.to_i, $2, $3.to_i
+          Thread.send(:new, board, id, title, last)
+        end
+      end
+
+      def initialize(board, id, title, last = 1)
+        super
+      end
+
+      def posts(range)
+        fail ArgumentError unless range.is_a? Range
+        dat_for_range(range).each_line.map do |line|
+          post = create_post(line.chomp)
+          @last = [post.no, last].max
+          post
+        end
+      end
+
+      private
+
+      def create_post(line)
+        no, name, mail, date, body, = line.split('<>', 6)
+        Post.new(no, name, mail, date, body)
+      end
+
+      def dat_for_range(range)
+        if range.last == Float::INFINITY
+          query = "#{range.first}-"
+        else
+          query = "#{range.first}-#{range.last}"
+        end
+        url = URI(dat_url + query)
+        @board.send(:download_text, url)
+      end
+    end
+  end # Shitaraba
+
+  module Nichan
+    # 2ちゃん板
+    class Board < Bbs::BoardBase
+      class << self
+        def from_url(url)
+          uri = URI.parse(url)
+          board_name = uri.path.split('/').reject(&:empty?).first
+          raise 'bad url' if board_name.nil?
+          Board.send(:new, uri.hostname, uri.port, board_name)
+        end
+      end
+
+      def initialize(hostname, port, name)
+        super('CP932')
+        @hostname, @port, @name = hostname, port, name
+
+        @settings_url = URI.parse("http://#{hostname}:#{port}/#{name}/SETTING.TXT")
+        @thread_list_url = URI.parse("http://#{hostname}:#{port}/#{name}/subject.txt")
+      end
+
+      def dat_url(thread_num)
+        "http://#{@hostname}:#{@port}/#{@name}/dat/#{thread_num}.dat"
+      end
+
+      def create_thread_from_line(line)
+        Thread.from_line(line, self)
+      end
+    end
+
+    NICHAN_THREAD_URL_PATTERN = %r{\Ahttp://[a-zA-z\-\.]+/test/read\.cgi\/(\w+)/(\d+)($|/)}
+
+    # 2ちゃんスレッド
+    class Thread < ThreadBase
+      class << self
+        def from_url(url)
+          if url.to_s =~ NICHAN_THREAD_URL_PATTERN
+            board_name, thread_num = $1, $2.to_i
+            uri = URI(url)
+            board = Board.send(:new, uri.hostname, uri.port, board_name)
+            thread = board.thread(thread_num)
+            raise 'no such thread' if thread.nil?
+            return thread
+          else
+            raise 'bad URL'
+          end
+        end
+
+        def from_line(line, board)
+          unless line =~ /^(\d+)\.dat<>(.+?) \((\d+)\)$/
+            fail 'スレ一覧のフォーマットが変です' 
+          end
+          id, title, last = $1.to_i, $2, $3.to_i
+          Thread.send(:new, board, id, title, last)
+        end
+      end
+
+      def initialize(board, id, title, last = 1)
+        super
       end
+
+      def posts(range)
+        fail ArgumentError unless range.is_a? Range
+        url = URI(dat_url)
+        lines = @board.send(:download_text, url)
+        ary = []
+        lines.each_line.with_index(1) do |line, res_no|
+          next unless range.include?(res_no)
+
+          name, mail, date, body, title = line.chomp.split('<>', 5)
+          post = Post.new(res_no.to_s, name, mail, date, body)
+          ary << post
+          @last = [post.no, last].max
+        end
+        return ary
+      end
+
     end
+
   end
 
-  def dat_for_range(range)
-    if range.last == Float::INFINITY
-      query = "#{range.first}-"
-    else
-      query = "#{range.first}-#{range.last}"
+  # Bbs.create_board(url) → Shitaraba::Board | Nichan::Board
+  # Bbs.create_thread(url) → Shitaraba::Thread | Nichan::Thread
+
+  BOARD_CLASSES = [Shitaraba::Board, Nichan::Board].freeze
+  THREAD_CLASSES = [Shitaraba::Thread, Nichan::Thread].freeze
+
+  if $DEBUG
+    unless BOARD_CLASSES.all? { |k| k.respond_to?(:from_url) }
+      raise 'unmet assumption'
+    end
+
+    unless THREAD_CLASSES.all? { |k| k.respond_to?(:from_url) and k.respond_to?(:from_line) }
+      raise 'unmet assumption'
     end
-    url = URI(dat_url + query)
-    @board.ダウンロード(url).force_encoding("EUC-JP").encode("UTF-8")
   end
-end
 
-end # Module
-# include Bbs
-# 自板 = C板.new("game", 48538)
-# # puts 自板.設定
-# # puts 自板.スレ一覧
-# t =  自板.thread(1416739363)
+  def create_board(url)
+    BOARD_CLASSES.each do |klass|
+      board = klass.from_url(url)
+      return board if board
+    end
+    return nil
+  end
+  module_function :create_board
 
-# p t.posts(900..950)
+  def create_thread(url)
+    THREAD_CLASSES.each do |klass|
+      thread = klass.from_url(url)
+      return thread if thread
+    end
+    return nil
+  end
+  module_function :create_thread
 
+end # Bbs

data/lib/bbiff/executable.rb

@@ -67,10 +67,18 @@ class Executable
     end
   end
 
+  def get_board_settings(board)
+    return board.settings
+  rescue Bbs::Downloader::DownloadFailure => e
+    STDERR.puts "Warning: 以下の場所から掲示板の設定が取得できませんでした。(#{e.response.message})"
+    STDERR.puts board.settings_url
+    return {'BBS_TITLE'=>'＜不明＞'}
+  end
+
   def start_polling(thread, start_no)
     out = LineIndicator.new
     delay = @settings.current['delay_seconds']
-    board_settings = thread.board.設定
+    board_settings = get_board_settings(thread.board)
     thread_stop = (board_settings['BBS_THREAD_STOP'] || '1000').to_i
 
     puts "#{board_settings['BBS_TITLE']} − #{thread.title}(#{thread.last})"
@@ -104,7 +112,9 @@ class Executable
   rescue Interrupt
     STDERR.puts "\nユーザー割り込みにより停止"
   rescue => e
-    STDERR.puts "error occured #{e.message}"
+    STDERR.puts "error occured"
+    puts e.message
+    puts e.backtrace
     STDERR.puts "retrying..., ^C to quit"
     sleep 3
     start_polling(thread, start_no)
@@ -129,24 +139,20 @@ EOD
       raise UsageError
     elsif ARGV.size < 1
       url = @settings.current['thread_url']
+      thread = Bbs::create_thread(url)
     else
       url = ARGV[0]
 
-      if url =~ %r{\Ah?ttp://jbbs.shitaraba.net/bbs/read.cgi/(\w+)/(\d+)/(\d+)/?\z}
+      begin
+        thread = Bbs::create_thread(url)
         @settings.current['thread_url'] = url
-      else
+      rescue
         puts "URLが変です"
         usage
         exit 1
       end
     end
 
-    if url =~ %r{\Ah?ttp://jbbs.shitaraba.net/bbs/read.cgi/(\w+)/(\d+)/(\d+)/?\z}
-      ita = [$1, $2.to_i]
-      sure = $3.to_i
-    end
-
-    thread = Bbs::C板.new(*ita).thread(sure)
     start_no = ARGV[1] ? ARGV[1].to_i : thread.last + 1
     start_polling(thread, start_no)
   rescue UsageError

data/lib/bbiff/res_format.rb

@@ -23,24 +23,6 @@ def render_resno(no)
   no.to_s
 end
 
-def render_date(t)
-  weekday = [*'日月火水木金土'.each_char]
-  delta = Time.now - t
-
-  case delta
-  when 0...1
-    "たった今"
-  when 1...60
-    "#{delta.to_i}秒前"
-  when 60...3600
-    "#{(delta / 60).to_i}分前"
-  when 3600...(24 * 3600)
-    "#{(delta / 3600).to_i}時間前"
-  else
-    "%d/%d/%d(%s) %02d:%02d:%02d" % [t.year, t.month, t.day, weekday[t.wday], t.hour, t.min, t.sec]
-  end
-end
-
 def indent(n, text)
   text.each_line.map { |line| n.en + line }.join
 end
@@ -51,7 +33,7 @@ def render_body(body)
 end
 
 def render_post(post)
-  "#{render_resno post.no}：#{render_name post.name, post.mail}：#{render_date post.date}\n" \
+  "#{render_resno post.no}：#{render_name post.name, post.mail}：#{post.date}\n" \
   "#{render_body post.body}"
 end
 

data/lib/bbiff/show.rb

@@ -16,7 +16,7 @@ class Show
     end
 
     title = ARGV[0]
-    post = Bbs::Post.from_line(ARGV[1])
+    post = Bbs::Post.from_s(ARGV[1])
     notify_send = ENV['BBIFF_NOTIFY_SEND'] || 
                   (`which #{NOTIFY_SEND}` != "" ? NOTIFY_SEND : 'echo')
     system("#{notify_send} #{Shellwords.escape(title)} #{Shellwords.escape(render_post(post))}")

data/lib/bbiff/version.rb

@@ -1,3 +1,3 @@
 module Bbiff
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbiff
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Yoteichi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-02 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler