X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=lib%2Frbot%2Fcore%2Futils%2Futils.rb;h=535ae190179c1bfbfa577a180d42baa24014f079;hb=a209adb0e00e2a335333c1cb696d5807a47072c6;hp=335d0506ebf5cefba859b54e9ee6b8b5d753c129;hpb=23129dce2e68fd4723fed01058c50280b9a63ba8;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git diff --git a/lib/rbot/core/utils/utils.rb b/lib/rbot/core/utils/utils.rb index 335d0506..535ae190 100644 --- a/lib/rbot/core/utils/utils.rb +++ b/lib/rbot/core/utils/utils.rb @@ -31,272 +31,83 @@ rescue LoadError module ::Irc module Utils UNESCAPE_TABLE = { - 'laquo' => '<<', - 'raquo' => '>>', + 'laquo' => '«', + 'raquo' => '»', 'quot' => '"', 'apos' => '\'', - 'micro' => 'u', - 'copy' => '(c)', - 'trade' => '(tm)', - 'reg' => '(R)', - '#174' => '(R)', - '#8220' => '"', - '#8221' => '"', - '#8212' => '--', - '#39' => '\'', + 'micro' => 'µ', + 'copy' => '©', + 'trade' => '™', + 'reg' => '®', 'amp' => '&', 'lt' => '<', 'gt' => '>', - 'hellip' => '...', - 'nbsp' => ' ', -=begin - # extras codes, for future use... - 'zwnj' => '‌', - 'aring' => '\xe5', - 'gt' => '>', - 'yen' => '\xa5', - 'ograve' => '\xf2', - 'Chi' => 'Χ', - 'bull' => '•', - 'Egrave' => '\xc8', - 'Ntilde' => '\xd1', - 'upsih' => 'ϒ', - 'Yacute' => '\xdd', - 'asymp' => '≈', - 'radic' => '√', - 'otimes' => '⊗', - 'nabla' => '∇', - 'aelig' => '\xe6', - 'oelig' => 'œ', - 'equiv' => '≡', - 'Psi' => 'Ψ', - 'auml' => '\xe4', - 'circ' => 'ˆ', - 'Acirc' => '\xc2', - 'Epsilon' => 'Ε', - 'Yuml' => 'Ÿ', - 'Eta' => 'Η', - 'Icirc' => '\xce', - 'Upsilon' => 'Υ', - 'ndash' => '–', - 'there4' => '∴', - 'Prime' => '″', - 'prime' => '′', - 'psi' => 'ψ', - 'Kappa' => 'Κ', - 'rsaquo' => '›', - 'Tau' => 'Τ', - 'darr' => '↓', - 'ocirc' => '\xf4', - 'lrm' => '‎', - 'zwj' => '‍', - 'cedil' => '\xb8', - 'Ecirc' => '\xca', - 'not' => '\xac', - 'AElig' => '\xc6', - 'oslash' => '\xf8', - 'acute' => '\xb4', - 'lceil' => '⌈', - 'shy' => '\xad', - 'rdquo' => '”', - 'ge' => '≥', - 'Igrave' => '\xcc', - 'Ograve' => '\xd2', - 'euro' => '€', - 'dArr' => '⇓', - 'sdot' => '⋅', - 'nbsp' => '\xa0', - 'lfloor' => '⌊', - 'lArr' => '⇐', - 'Auml' => '\xc4', - 'larr' => '←', - 'Atilde' => '\xc3', - 'Otilde' => '\xd5', - 'szlig' => '\xdf', - 'clubs' => '♣', - 'diams' => '♦', - 'agrave' => '\xe0', - 'Ocirc' => '\xd4', - 'Iota' => 'Ι', - 'Theta' => 'Θ', - 'Pi' => 'Π', - 'OElig' => 'Œ', - 'Scaron' => 'Š', - 'frac14' => '\xbc', - 'egrave' => '\xe8', - 'sub' => '⊂', - 'iexcl' => '\xa1', - 'frac12' => '\xbd', - 'sbquo' => '‚', - 'ordf' => '\xaa', - 'sum' => '∑', - 'prop' => '∝', - 'Uuml' => '\xdc', - 'ntilde' => '\xf1', - 'sup' => '⊃', - 'theta' => 'θ', - 'prod' => '∏', - 'nsub' => '⊄', - 'hArr' => '⇔', - 'rlm' => '‏', - 'THORN' => '\xde', - 'infin' => '∞', - 'yuml' => '\xff', - 'Mu' => 'Μ', - 'le' => '≤', - 'Eacute' => '\xc9', - 'thinsp' => ' ', - 'ecirc' => '\xea', - 'bdquo' => '„', - 'Sigma' => 'Σ', - 'fnof' => 'ƒ', - 'Aring' => '\xc5', - 'tilde' => '˜', - 'frac34' => '\xbe', - 'emsp' => ' ', - 'mdash' => '—', - 'uarr' => '↑', - 'permil' => '‰', - 'Ugrave' => '\xd9', - 'rarr' => '→', - 'Agrave' => '\xc0', - 'chi' => 'χ', - 'forall' => '∀', - 'eth' => '\xf0', - 'rceil' => '⌉', - 'iuml' => '\xef', - 'gamma' => 'γ', - 'lambda' => 'λ', - 'harr' => '↔', - 'rang' => '〉', - 'xi' => 'ξ', - 'dagger' => '†', - 'divide' => '\xf7', - 'Ouml' => '\xd6', - 'image' => 'ℑ', - 'alefsym' => 'ℵ', - 'igrave' => '\xec', - 'otilde' => '\xf5', - 'Oacute' => '\xd3', - 'sube' => '⊆', - 'alpha' => 'α', - 'frasl' => '⁄', - 'ETH' => '\xd0', - 'lowast' => '∗', - 'Nu' => 'Ν', - 'plusmn' => '\xb1', - 'Euml' => '\xcb', - 'real' => 'ℜ', - 'sup1' => '\xb9', - 'sup2' => '\xb2', - 'sup3' => '\xb3', - 'Oslash' => '\xd8', - 'Aacute' => '\xc1', - 'cent' => '\xa2', - 'oline' => '‾', - 'Beta' => 'Β', - 'perp' => '⊥', - 'Delta' => 'Δ', - 'loz' => '◊', - 'pi' => 'π', - 'iota' => 'ι', - 'empty' => '∅', - 'euml' => '\xeb', - 'brvbar' => '\xa6', - 'iacute' => '\xed', - 'para' => '\xb6', - 'micro' => '\xb5', - 'cup' => '∪', - 'weierp' => '℘', - 'uuml' => '\xfc', - 'part' => '∂', - 'icirc' => '\xee', - 'delta' => 'δ', - 'omicron' => 'ο', - 'upsilon' => 'υ', - 'Iuml' => '\xcf', - 'Lambda' => 'Λ', - 'Xi' => 'Ξ', - 'kappa' => 'κ', - 'ccedil' => '\xe7', - 'Ucirc' => '\xdb', - 'cap' => '∩', - 'mu' => 'μ', - 'scaron' => 'š', - 'lsquo' => '‘', - 'isin' => '∈', - 'Zeta' => 'Ζ', - 'supe' => '⊇', - 'deg' => '\xb0', - 'and' => '∧', - 'tau' => 'τ', - 'pound' => '\xa3', - 'hellip' => '…', - 'curren' => '\xa4', - 'int' => '∫', - 'ucirc' => '\xfb', - 'rfloor' => '⌋', - 'ensp' => ' ', - 'crarr' => '↵', - 'ugrave' => '\xf9', - 'notin' => '∉', - 'exist' => '∃', - 'uArr' => '⇑', - 'cong' => '≅', - 'Dagger' => '‡', - 'oplus' => '⊕', - 'times' => '\xd7', - 'atilde' => '\xe3', - 'piv' => 'ϖ', - 'ni' => '∋', - 'Phi' => 'Φ', - 'lsaquo' => '‹', - 'Uacute' => '\xda', - 'Omicron' => 'Ο', - 'ang' => '∠', - 'ne' => '≠', - 'iquest' => '\xbf', - 'eta' => 'η', - 'yacute' => '\xfd', - 'Rho' => 'Ρ', - 'uacute' => '\xfa', - 'Alpha' => 'Α', - 'zeta' => 'ζ', - 'Omega' => 'Ω', - 'nu' => 'ν', - 'sim' => '∼', - 'sect' => '\xa7', - 'phi' => 'φ', - 'sigmaf' => 'ς', - 'macr' => '\xaf', - 'minus' => '−', - 'Ccedil' => '\xc7', - 'ordm' => '\xba', - 'epsilon' => 'ε', - 'beta' => 'β', - 'rArr' => '⇒', - 'rho' => 'ρ', - 'aacute' => '\xe1', - 'eacute' => '\xe9', - 'omega' => 'ω', - 'middot' => '\xb7', - 'Gamma' => 'Γ', - 'Iacute' => '\xcd', - 'lang' => '〈', - 'spades' => '♠', - 'rsquo' => '’', - 'uml' => '\xa8', - 'thorn' => '\xfe', - 'ouml' => '\xf6', - 'thetasym' => 'ϑ', - 'or' => '∨', - 'raquo' => '\xbb', - 'acirc' => '\xe2', - 'ldquo' => '“', - 'hearts' => '♥', - 'sigma' => 'σ', - 'oacute' => '\xf3', -=end + 'hellip' => '…', + 'nbsp' => ' ', + 'Agrave' => 'À', + 'Aacute' => 'Á', + 'Acirc' => 'Â', + 'Atilde' => 'Ã', + 'Auml' => 'Ä', + 'Aring' => 'Å', + 'AElig' => 'Æ', + 'OElig' => 'Œ', + 'Ccedil' => 'Ç', + 'Egrave' => 'È', + 'Eacute' => 'É', + 'Ecirc' => 'Ê', + 'Euml' => 'Ë', + 'Igrave' => 'Ì', + 'Iacute' => 'Í', + 'Icirc' => 'Î', + 'Iuml' => 'Ï', + 'ETH' => 'Ð', + 'Ntilde' => 'Ñ', + 'Ograve' => 'Ò', + 'Oacute' => 'Ó', + 'Ocirc' => 'Ô', + 'Otilde' => 'Õ', + 'Ouml' => 'Ö', + 'Oslash' => 'Ø', + 'Ugrave' => 'Ù', + 'Uacute' => 'Ú', + 'Ucirc' => 'Û', + 'Uuml' => 'Ü', + 'Yacute' => 'Ý', + 'THORN' => 'Þ', + 'szlig' => 'ß', + 'agrave' => 'à', + 'aacute' => 'á', + 'acirc' => 'â', + 'atilde' => 'ã', + 'auml' => 'ä', + 'aring' => 'Ã¥', + 'aelig' => 'æ', + 'oelig' => 'œ', + 'ccedil' => 'ç', + 'egrave' => 'è', + 'eacute' => 'é', + 'ecirc' => 'ê', + 'euml' => 'ë', + 'igrave' => 'ì', + 'iacute' => 'í', + 'icirc' => 'î', + 'iuml' => 'ï', + 'eth' => 'ð', + 'ntilde' => 'ñ', + 'ograve' => 'ò', + 'oacute' => 'ó', + 'ocirc' => 'ô', + 'otilde' => 'õ', + 'ouml' => 'ö', + 'oslash' => 'ø', + 'ugrave' => 'ù', + 'uacute' => 'ú', + 'ucirc' => 'û', + 'uuml' => 'ü', + 'yacute' => 'ý', + 'thorn' => 'þ', + 'yuml' => 'ÿ' } end end @@ -307,7 +118,8 @@ begin require 'hpricot' module ::Irc module Utils - AFTER_PAR_PATH = /^(?:div|span|td|tr|tbody|table)$/ + AFTER_PAR_PATH = /^(?:div|span)$/ + AFTER_PAR_EX = /^(?:td|tr|tbody|table)$/ AFTER_PAR_CLASS = /body|message|text/i end end @@ -465,7 +277,7 @@ module ::Irc end # output the symbol's irc-translated character, or a * if it's unknown - UNESCAPE_TABLE[symbol] || [symbol[/\d+/].to_i].pack("U") rescue '*' + UNESCAPE_TABLE[symbol] || (symbol.match(/^\d+$/) ? [$0.to_i].pack("U") : '*') } end end @@ -513,7 +325,8 @@ module ::Irc if pre_h.nil? pre_h = Hpricot::Elements[] found_h = false - doc.root.search("*") { |e| + doc.search("*") { |e| + next if e.bogusetag? case e.pathname when /^h\d/ found_h = true @@ -555,12 +368,23 @@ module ::Irc # 'message' or 'text' in their class to mark actual text. Since we want # the class match to be partial and case insensitive, we collect # the common elements that may have this class and then filter out those - # we don't need + # we don't need. If no divs or spans are found, we'll accept additional + # elements too (td, tr, tbody, table). if by_span.nil? by_span = Hpricot::Elements[] - doc.root.search("*") { |el| - by_span.push el if el.pathname =~ AFTER_PAR_PATH and (el[:class] =~ AFTER_PAR_CLASS or el[:id] =~ AFTER_PAR_CLASS) + extra = Hpricot::Elements[] + doc.search("*") { |el| + next if el.bogusetag? + case el.pathname + when AFTER_PAR_PATH + by_span.push el if el[:class] =~ AFTER_PAR_CLASS or el[:id] =~ AFTER_PAR_CLASS + when AFTER_PAR_EX + extra.push el if el[:class] =~ AFTER_PAR_CLASS or el[:id] =~ AFTER_PAR_CLASS + end } + if by_span.empty? and not extra.empty? + by_span.concat extra + end debug "other \#1: found: #{by_span.pretty_inspect}" end @@ -681,9 +505,6 @@ module ::Irc when Net::HTTPResponse Utils.get_resp_html_info(doc, opts) when URI - if doc.fragment and not doc.fragment.empty? - opts[:uri_fragment] ||= doc.fragment - end ret = Hash.new @@bot.httputil.get_response(doc) { |resp| ret = Utils.get_resp_html_info(resp, opts) @@ -717,8 +538,12 @@ module ::Irc when Net::HTTPSuccess ret[:headers] = resp.to_hash + partial = resp.partial_body(@@bot.config['http.info_bytes']) if resp['content-type'] =~ /^text\/|(?:x|ht)ml/ - partial = resp.partial_body(@@bot.config['http.info_bytes']) + loc = URI.parse(resp['x-rbot-location'] || resp['location']) rescue nil + if loc and loc.fragment and not loc.fragment.empty? + opts[:uri_fragment] ||= loc.fragment + end ret.merge!(Utils.get_string_html_info(partial, opts)) end return ret