inat-channel 0.8.0.14 → 0.9.0

data/lib/inat-channel/data_convert.rb

@@ -0,0 +1,108 @@
+require 'date'
+require 'time'
+require 'set'
+
+require_relative 'data_types'
+
+module INatChannel
+
+  module DataConvert
+
+    class << self
+
+      def convert_observation observation_source
+        begin
+          id = observation_source[:id]
+          url = observation_source[:uri]
+          uuid = observation_source[:uuid]
+          user = convert_user observation_source[:user]
+          taxon = convert_taxon observation_source[:taxon], observation_source[:identifications]
+          places = convert_places observation_source[:place_ids]
+          datetime = DateTime.parse(observation_source[:time_observed_at] || observation_source[:observed_on_string])
+          location = convert_location observation_source[:geojson]
+          description = convert_description observation_source[:description]
+          place_guess = observation_source[:place_guess]
+        rescue => e
+          IC::logger.error e.full_message
+          IC::logger.info JSON.pretty_generate(observation_source)
+          raise e
+        end
+        Observation::new id: id, url: url, uuid: uuid, user: user, taxon: taxon, places: places, datetime: datetime, location: location, description: description, place_guess: place_guess
+      end
+
+      private
+
+      def convert_location location_source
+        return nil unless location_source
+        lat = location_source.dig :coordinates, 1
+        lng = location_source.dig :coordinates, 0
+        return nil unless lat && lng
+        Location::new lat: lat, lng: lng
+      end
+
+      def convert_description description_source
+        return nil if description_source.nil? || description_source.empty?
+        Description::new value: description_source
+      end
+
+      def convert_user user_source
+        User::new id: user_source[:id], login: user_source[:login], name: user_source[:name]
+      end
+
+      def convert_taxon taxon_source, identifications
+        id = taxon_source[:id]
+        scientific_name = taxon_source[:name]
+        common_name = taxon_source[:preferred_common_name]
+        source_ancestors = nil
+        identifications.each do |ident|
+          it = ident[:taxon]
+          if it[:id] == id
+            source_ancestors = it[:ancestors]
+            break
+          end
+        end
+        ancestors = if source_ancestors
+          source_ancestors.map do |anc|
+            Ancestor::new id: anc[:id], scientific_name: anc[:name]
+          end
+        else
+          taxon_source[:ancestor_ids].map do |aid|
+            Ancestor::new id: aid
+          end
+          # TODO: load names from API by ancestor_ids
+        end
+        ancestors << Ancestor::new(id: taxon_source[:id], scientific_name: taxon_source[:name])
+        Taxon::new id: id, scientific_name: scientific_name, common_name: common_name, ancestors: ancestors
+      end
+
+      def convert_places place_ids
+        places_config = IC::CONFIG[:places]
+        return nil unless places_config
+        result = []
+        places_config.each do |_, items|
+          items.each do |item|
+            ids = Set[*item[:place_ids]]
+            if ids.intersect?(place_ids)
+              result << Place::new(text: item[:text], link: item[:link], tag: item[:tag])
+              break
+            end
+          end
+        end
+        result
+      end
+
+    end
+
+  end
+
+end
+
+module IC 
+
+  def convert_observation source
+    INatChannel::DataConvert::convert_observation source
+  end
+
+  module_function :convert_observation
+
+end

data/lib/inat-channel/data_types.rb

@@ -0,0 +1,201 @@
+require 'date'
+require 'time'
+require 'sanitize'
+
+require_relative 'icons'
+
+class Date
+  def icon
+    IC::ICONS[:calendar]
+  end
+end
+
+class Time
+  def icon
+    IC::clock_icon self
+  end
+end
+
+class DateTime
+  def icon
+    IC::ICONS[:calendar]
+  end
+end
+
+class String
+  def to_tag
+    "\##{self.gsub(/\s+/, '_').gsub(/-/, '_').gsub(/[^a-zA-Zа-яА-ЯёЁ_]/, '')}"
+  end
+  def limit len
+    return self if length <= len
+
+    short = self[0, len]
+    last_space = short.rindex(/\s/)
+    last_sign = short.rindex(/[,.;:!?]/)
+    if last_space
+      if last_sign && last_sign + 1 > last_space
+        return short[0, last_sign + 1] + '...'
+      end
+      return short[0, last_space] + '...'
+    else
+      if last_sign
+        return short[0, last_sign + 1] + '...'
+      end
+      return short + '...'
+    end
+  end
+end
+
+class Array 
+  def to_tags
+    self.map do |item| 
+      if item.respond_to?(:to_tag)
+        item.to_tag 
+      else
+        item&.to_s.to_tag
+      end
+    end.compact
+  end
+end
+
+Observation = Data::define :taxon, :id, :uuid, :url, :user, :datetime, :places, :place_guess, :description, :location do
+  def icon
+    IC::ICONS[:observation]
+  end
+  def date
+    datetime.to_date
+  end
+  def time
+    datetime.to_time
+  end
+end
+
+Taxon = Data::define :scientific_name, :common_name, :id, :ancestors do
+  def icon
+    IC::ancestors_icon ancestors.map(&:id)
+  end
+  def title
+    if common_name && !common_name.empty?
+      "<b>#{common_name}</b> <i>(#{scientific_name})</i>"
+    else
+      "<b><i>#{scientific_name}</i></b>"
+    end
+  end
+  def url
+    "https://www.inaturalist.org/taxa/#{id}"
+  end
+  def to_tags
+    ancestors.to_tags
+  end
+end
+
+Ancestor = Data::define :scientific_name, :id do
+  def to_tag
+    scientific_name.to_tag
+  end
+end
+
+Place = Data::define :text, :link, :tag do
+  def icon
+    IC::ICONS[:place]
+  end
+  def to_tag
+    tag&.to_tag
+  end
+  def title
+    text
+  end
+  def url
+    link
+  end
+end
+
+User = Data::define :id, :login, :name do
+  def icon
+    IC::ICONS[:user]
+  end
+  def title
+    if name && !name.empty?
+      name
+    else
+      "@#{login}"
+    end
+  end
+  def url 
+    "https://www.inaturalist.org/people/#{id}"
+  end
+end
+
+module IC
+
+  SANITIZE_HTML_CONFIG = {
+    elements: [ 'b', 'strong', 'i', 'em', 'u', 's', 'strike', 'del', 'a', 'code', 'pre', 'tg-spoiler', 'blockquote' ],
+    attributes: { 'a' => [ 'href' ] },
+    protocols: { 'a' => { 'href' => [ 'http', 'https', 'mailto', 'tg' ] } },
+    remove_contents: [ 'script', 'style' ]
+  }
+
+  SANITIZE_TEXT_CONFIG = {
+    elements: [],
+    remove_contents: [ 'script', 'style' ]
+  }
+
+end
+
+Description = Data::define :value do
+  def icon
+    IC::ICONS[:description]
+  end
+  def text
+    Sanitize.fragment(value, IC::SANITIZE_TEXT_CONFIG).limit(IC::CONFIG.dig(:tg_bot, :desc_limit))
+  end
+  def html
+    sanitized = Sanitize.fragment value, IC::SANITIZE_HTML_CONFIG
+    if sanitized.length > IC::CONFIG.dig(:tg_bot, :desc_limit)
+      # В отличие от простого текста, обрезка HTML требует куда более изощренной логики, что неоправданно
+      text
+    else
+      sanitized
+    end
+  end
+end
+
+Location = Data::define :lat, :lng do
+  def icon
+    IC::ICONS[:location]
+  end
+  def dms
+    lat_dir = lat >= 0 ? "N" : "S"
+    lng_dir = lng >= 0 ? "E" : "W"
+    lat_abs = lat.abs
+    lng_abs = lng.abs
+    lat_d = lat_abs.floor
+    lat_m = ((lat_abs - lat_d) * 60).floor
+    lat_s = ((lat_abs - lat_d - lat_m / 60.0) * 3600).round
+    lng_d = lng_abs.floor
+    lng_m = ((lng_abs - lng_d) * 60).floor
+    lng_s = ((lng_abs - lng_d - lng_m / 60.0) * 3600).round
+    "%d°%02d'%02d\"%s %d°%02d'%02d\"%s" % [lat_d, lat_m, lat_s, lat_dir, lng_d, lng_m, lng_s, lng_dir]
+  end
+  def decimal
+    lat_dir = lat >= 0 ? "N" : "S"
+    lng_dir = lng >= 0 ? "E" : "W"
+    lat_abs = lat.abs
+    lng_abs = lng.abs
+    "%.4f°%s, %.4f°%s" % [lat_abs, lat_dir, lng_abs, lng_dir]
+  end
+  def google
+    # "https://www.google.com/maps/search/?api=1&query=#{lat},#{lng}&z=#{FORMATS[:zoom]}&ll=#{lat},#{lng}"
+    "https://www.google.com/maps/place/#{lat},#{lng}/@#{lat},#{lng},#{IC::CONFIG.dig(:tg_bot, :link_zoom)}z/"
+  end
+  def yandex
+    "https://yandex.ru/maps/?ll=#{lng},#{lat}&z=#{IC::CONFIG.dig(:tg_bot, :link_zoom)}&pt=#{lng},#{lat},pm2rdm1"
+  end
+  def osm
+     "https://www.openstreetmap.org/?mlat=#{lat}&mlon=#{lng}#map=#{IC::CONFIG.dig(:tg_bot, :link_zoom)}/#{lat}/#{lng}"
+  end
+  def url
+    osm
+  end
+end
+

data/lib/inat-channel/icons.rb

@@ -1,58 +1,135 @@
-
 module INatChannel
-
   module Icons
-
     TAXA_ICONS = {
-      48460  => '🧬',
-      47126  => '🌿',
-      47170  => '🍄',
-      47686  => '🦠',
-      151817 => '🦠',
-      67333  => '🦠',
-      1      => '🐾',
-      136329 => '🌲',
-      47124  => '🌸',
-      47163  => '🍃',
-      47178  => '🐟',
-      196614 => '🦈',
-      47187  => '🦀',
-      47158  => '🪲',
-      47119  => '🕷️',
-      71261  => '🦅',
-      18874  => '🦜',
-      48222  => '🌊',
-      47115  => '🐚',
-      3      => '🐦',
-      40151  => '🦌',
-      26036  => '🐍',
-      20978  => '🐸'
-
-      # TODO: add ALL taxa with iNat icons and some other large group
-    }.freeze
+      48460 => "🧬",
+      47126 => "🌿",
+      47170 => "🍄",
+      47686 => "🦠",
+      151817 => "🦠",
+      67333 => "🦠",
+      1 => "🐾",
+      136329 => "🌲",
+      47124 => "🌸",
+      47163 => "🍃",
+      47178 => "🐟",
+      196614 => "🦈",
+      47187 => "🦀",
+      47158 => "🪲",
+      47119 => "🕷️",
+      71261 => "🦅",
+      18874 => "🦜",
+      48222 => "🌊",
+      47115 => "🐚",
+      3 => "🐦",
+      40151 => "🦌",
+      26036 => "🐍",
+      20978 => "🐸",
+
+    # TODO: add ALL taxa with iNat icons and some other large group
+    }
 
     ICONS = {
-      :user => '👤',
-      :place => '🗺️',
-      :calendar => '📅',
-      :location => '📍',
-      :observation => '📷',
-      :description => '📝',
-      :default_taxon => '🧬'
-      # TODO: add other icons like calendar, place, etc.
-    }.freeze
+      :user => "👤",
+      :place => "🗺️",
+      :calendar => "📅",
+      :location => "📍",
+      :observation => "📷",
+      :description => "📝",
+      :default_taxon => "🧬",
+    # TODO: add other icons like calendar, place, etc.
+    }
 
     class << self
-
       def taxon_icon taxon
-        taxon[:ancestor_ids].reverse_each do |ancestor_id|
-          return TAXA_ICONS[ancestor_id] if TAXA_ICONS[ancestor_id] 
+        ancestors_icon taxon[:ancestor_ids]
+      end
+
+      def ancestors_icon ancestor_ids 
+        ancestor_ids.reverse_each do |ancestor_id|
+          return TAXA_ICONS[ancestor_id] if TAXA_ICONS[ancestor_id]
         end
         return ICONS[:default_taxon]
       end
 
+      def clock_icon time
+        hour = time.hour % 12
+        minute = time.min
+
+        if minute <= 20
+          # ≤20 мин - текущий час
+          case hour
+          when 0, 12 then "🕛"
+          when 1 then "🕐"
+          when 2 then "🕑"
+          when 3 then "🕒"
+          when 4 then "🕓"
+          when 5 then "🕔"
+          when 6 then "🕕"
+          when 7 then "🕖"
+          when 8 then "🕗"
+          when 9 then "🕘"
+          when 10 then "🕙"
+          when 11 then "🕚"
+          end
+        elsif minute < 40
+          # 21-39 мин - полчаса текущего часа
+          case hour
+          when 0, 12 then "🕧"
+          when 1 then "🕜"
+          when 2 then "🕝"
+          when 3 then "🕞"
+          when 4 then "🕟"
+          when 5 then "🕠"
+          when 6 then "🕡"
+          when 7 then "🕢"
+          when 8 then "🕣"
+          when 9 then "🕤"
+          when 10 then "🕥"
+          when 11 then "🕦"
+          end
+        else
+          # ≥40 мин - следующий час
+          next_hour = (hour + 1) % 12
+          case next_hour
+          when 0, 12 then "🕛"
+          when 1 then "🕐"
+          when 2 then "🕑"
+          when 3 then "🕒"
+          when 4 then "🕓"
+          when 5 then "🕔"
+          when 6 then "🕕"
+          when 7 then "🕖"
+          when 8 then "🕗"
+          when 9 then "🕘"
+          when 10 then "🕙"
+          when 11 then "🕚"
+          end
+        end
+      end
+
     end
 
   end
 
 end
+
+module IC
+
+  TAXA_ICONS = INatChannel::Icons::TAXA_ICONS
+  ICONS = INatChannel::Icons::ICONS
+
+  def taxon_icon taxon
+    INatChannel::Icons::taxon_icon taxon
+  end
+
+  def ancestors_icon ancestor_ids
+    INatChannel::Icons::ancestors_icon ancestor_ids
+  end
+
+  def clock_icon time
+    INatChannel::Icons::clock_icon time
+  end
+
+  module_function :taxon_icon, :ancestors_icon, :clock_icon
+
+end

data/lib/inat-channel/lock.rb

@@ -12,13 +12,13 @@ module INatChannel
     class << self
 
       def acquire!
-        file = INatChannel::CONFIG[:lock_file]
+        file = IC::CONFIG.dig(:lock_file, :path)
         FileUtils.mkdir_p File.dirname(file)
 
         if File.exist?(file)
           data = load_data file
           if stale?(data)
-            INatChannel::LOGGER.info "Remove stale lock: #{file}"
+            IC::logger.info "Remove stale lock: #{file}"
             File.delete file
           else
             raise "Another instance is already running (PID: #{data[:pid]})"
@@ -30,15 +30,15 @@ module INatChannel
           started_at: Time.now.utc.iso8601
         }
         File.write file, JSON.pretty_generate(data)
-        INatChannel::LOGGER.info "Lock acquired: #{file}"
+        IC::logger.info "Lock acquired: #{file}"
       end
 
       def release!
-        file = INatChannel::CONFIG[:lock_file]
+        file = IC::CONFIG.dig(:lock_file, :path)
         return nil unless File.exist?(file)
 
         File.delete file
-        INatChannel::LOGGER.info "Lock release: #{file}"
+        IC::logger.info "Lock release: #{file}"
       end
 
       private
@@ -49,7 +49,7 @@ module INatChannel
         {}
       end
 
-      LOCK_TTL = 1800  # 30 min
+      LOCK_TTL = 300  # 5 min
 
       def stale? data
         if data[:started_at]

data/lib/inat-channel/logger.rb

@@ -14,7 +14,7 @@ module INatChannel
 
       def get_logger
         lgr = ::Logger::new $stderr
-        lgr.level = INatChannel::CONFIG[:log_level]
+        lgr.level = IC::CONFIG[:log_level]
         lgr
       end
 
@@ -22,7 +22,15 @@ module INatChannel
 
   end
 
-  LOGGER = Logger::logger
+end
+
+module IC
+
+  def logger
+    INatChannel::Logger::logger
+  end
+
+  module_function :logger
 
 end