tac_scribe 0.7.1-java → 0.7.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dc052878565aa0a92dca2eaf35fceec802af0ee74b7f316ea4efb2d243cef81
-  data.tar.gz: 601360e067fbf0812f9e4e77af1eb1ed724544a01db91a8df81e4c0e903922d9
+  metadata.gz: c39a4f860637756b22a7ce9fd09d74e2c7190478a94dbc779373ba0d213d0b35
+  data.tar.gz: 5abb08ea5e750d3e460ade56d89924866badb2a842b62b20672df2f0c349eb53
 SHA512:
-  metadata.gz: ba986646a11ca3315dd2a6b3e54b0c1ff6766f239d73540779645055ddd2710e32e28a7409dffea1482a5b50d88f08f9ed4a80e9b65ed5152daa90e9965d457f
-  data.tar.gz: 519a7874ef8a1f9ec48f34626e5b34e05850c0a532228dd8dd175a96c5fae39ae531792bea547ecb98530df96c5c9745dc714a834cbed712c4ae9dfe5e26ff09
+  metadata.gz: 0d0ba804851aa3143c0f5b563d7401706dd129b826dc5398174ead33b982a22d48d0871d0d5498eb922c4ca08c83598a7c3928e3f1a69a7cd2094a3a5acf8801
+  data.tar.gz: 641fe1a451dff87f915c69fdf6ea36a4053f4924d77141a3617d7019dcf27ff9d9f884f65894d20ae75414d3b18c0b2e40642d2248d9a022cc8061455855afd3

data/CHANGELOG.md

@@ -4,38 +4,48 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.7.1]
+## [Unreleased]
+
+## [0.7.3] - 2020-08-10
+### Changed
+- Bug fixes after adding CinC support.
+
+## [0.7.2] - 2020-08-10
+### Added
+- Support for "Commander-In-Chief" to get airbase information
+
+## [0.7.1] - 2020-08-10
 ### Changed
 - Fixed issue where "name" fields were not being populated
   if airfields were not being loaded first
 
-## [0.7.0]
+## [0.7.0] - 2020-07-5
 ### Changed
 - Synced Lat/Lon calculations with DCS and fixed issue where
   calculations were incorrect if only one value was updated
 
-## [0.6.2]
+## [0.6.2] - 2020-04-19
 ### Changed
 - Fixed typo causing app to fail
 
-## [0.6.1]
+## [0.6.1] - 2020-04-19
 ### Changed
 - Test build for gem issue
 
-## [0.6.0]
+## [0.6.0] - 2020-04-19
 ### Added
 - Calculates and stores speed of units
 
 ### Fixed
 - Made more robust against failures and more logging messages
 
-## [0.5.0]
+## [0.5.0] - 2020-03-17
 ### Changed
 - Added missing db column to migration file
 - Clear the cache on server restart
 - Add more info to logging
 
-## [0.4.0]
+## [0.4.0] - 2020-03-13
 ### Changed
 - Switch to periodic writing to the database
 

data/exe/tac_scribe

@@ -10,6 +10,8 @@ options = {
   tacview_port: 42_674,
   tacview_password: nil,
   tacview_client_name: 'TacScribe',
+  cinc_enabled: false,
+  cinc_port: 9000,
   db_host: 'localhost',
   db_port: 5432,
   db_name: 'tac_scribe',
@@ -43,6 +45,17 @@ OptionParser.new do |opts|
     options[:tacview_client_name] = v
   end
 
+  opts.separator "\nCommander-In-Chief Options"
+  opts.on('-b', '--enable-cinc',
+          'Is Cinc enabled? (Default: false)') do |_v|
+    options[:cinc_enabled] = true
+  end
+  opts.on('-m', '--cinc-port=port',
+          'Cinc server port (Default: 9001)') do |v|
+    options[:cinc_port] = v
+  end
+  
+
   opts.separator "\nDatabase Options"
   opts.on('-o', '--db-host=host',
           'Postgresql server hostname / IP (Default: localhost)') do |v|
@@ -92,6 +105,11 @@ end.parse!
   exit(1)
 end
 
+if(options[:populate_airfields] && options[:cinc_enabled])
+  puts "You cannot populate airfields AND enable Cinc at the same time"
+  exit(1)
+end
+
 TacScribe::Daemon.new(
   tacview_host: options[:tacview_host],
   tacview_port: options[:tacview_port],
@@ -105,5 +123,7 @@ TacScribe::Daemon.new(
   verbose_logging: options[:verbose],
   thread_count: options[:threads].to_i,
   populate_airfields: options[:populate_airfields],
-  whitelist: options[:whitelist]
+  whitelist: options[:whitelist],
+  cinc_enabled: options[:cinc_enabled],
+  cinc_port: options[:cinc_port]
 ).start_processing

data/lib/tac_scribe/cache.rb

@@ -23,11 +23,12 @@ module TacScribe
     end
 
     def write_object(object)
-      if reference_latitude != 0 || reference_longitude != 0
+      if (reference_latitude != 0 || reference_longitude != 0) && object[:type] != "Ground+Static+Aerodrome"
         localize_position(object)
       end
 
       id = object[:object_id]
+      id ||= object[:id].to_s
       object[:id] = id
 
       cache_object = @@cache[id]
@@ -39,7 +40,9 @@ module TacScribe
       end
 
       # https://wiki.hoggitworld.com/view/DCS_singleton_coalition
-      if object[:coalition]
+      # Tacview returns a string, CinC returns an integer so we
+      # only do the conversion if there is a string.
+      if object[:coalition] && object[:coalition].is_a?(String)
         object[:coalition] = case object[:coalition]
                              when 'Enemies' # Enemies is Bluefor
                                2
@@ -50,7 +53,15 @@ module TacScribe
                              end
       end
 
-      if cache_object
+      if object[:type] = "Ground+Static+Aerodrome"
+        object[:heading] = object[:wind_heading] ? object[:wind_heading] : 0
+        object[:speed] = object[:wind_speed] ? object[:wind_speec] : 0
+        object.delete(:wind_heading)
+        object.delete(:wind_speed)
+        object.delete(:category)
+        cache_object = object
+        # No-op
+      elsif cache_object
         object[:heading] = calculate_heading(cache_object, object)
         object[:speed] = calculate_speed(cache_object, object)
         cache_object.merge!(object)

data/lib/tac_scribe/daemon.rb

@@ -3,6 +3,7 @@
 require 'json'
 require 'tacview_client'
 require 'set'
+require 'cinc'
 require_relative 'datastore'
 require_relative 'cache'
 require_relative 'event_queue'
@@ -15,7 +16,7 @@ module TacScribe
     def initialize(db_host:, db_port:, db_name:, db_user:, db_password:,
                    tacview_host:, tacview_port:, tacview_password:,
                    tacview_client_name:, verbose_logging:, thread_count:,
-                   populate_airfields:, whitelist: nil)
+                   populate_airfields:, whitelist: nil, cinc_enabled:, cinc_port:)
       Datastore.instance.configure do |config|
         config.host = db_host
         config.port = db_port
@@ -34,13 +35,20 @@ module TacScribe
       @threads = {}
       @whitelist = Set.new(IO.read(whitelist).split) if whitelist
 
-      @client = TacviewClient::Client.new(
+      @tacview_client = TacviewClient::Client.new(
         host: tacview_host,
         port: tacview_port,
         password: tacview_password,
         processor: @event_queue,
         client_name: tacview_client_name
       )
+
+      if cinc_enabled
+        @cinc_client = Cinc::Client.new(
+          host: tacview_host,
+          port: cinc_port
+        )
+      end
     end
 
     # Starts processing and reconnects if the client was disconnected.
@@ -55,13 +63,14 @@ module TacScribe
         Datastore.instance.truncate_table
         Cache.instance.clear
         start_processing_threads
+        start_cinc_thread
         start_db_sync_thread
         start_reporting_thread
         populate_airfields if @populate_airfields
         @threads.each_pair do |key, _value|
           puts "#{key} thread started"
         end
-        @client.connect
+        @tacview_client.connect
         # If this code is executed it means we have been disconnected without
         # exceptions. We will still sleep to stop a retry storm. Just not as
         # long.
@@ -103,6 +112,30 @@ module TacScribe
       @threads[:processing] = event_processor_thread
     end
 
+    def start_cinc_thread
+      return unless @cinc_client
+      cinc_thread = Thread.new do
+        loop do
+          @cinc_client.connect
+          while true
+            @cinc_client.get_airbases.each do |airbase|
+              @event_queue.update_object Hash[airbase.map{ |k, v| [k.to_sym, v] }]
+            end
+            sleep 60
+          end
+          rescue StandardError => e
+            puts 'Exception in cinc thread'
+            puts e.message
+            puts e.backtrace
+            sleep 30
+            next
+        end
+      end
+
+      cinc_thread.name = 'Cinc Processor'
+      @threads[:cinc] = cinc_thread
+    end
+
     def start_db_sync_thread
       db_write_thread = Thread.new do
         loop do

data/lib/tac_scribe/event_processor.rb

@@ -70,7 +70,7 @@ module TacScribe
 
       # Hack to make sure the :name field is present so that it is included
       # in the SQL
-      event[:name] = "" unless event.has_key?(:name)
+      event[:name] = nil unless event.has_key?(:name)
       event[:game_time] = time
 
       self.events_processed += 1

data/lib/tac_scribe/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TacScribe
-  VERSION = '0.7.1'
+  VERSION = '0.7.3'
 end

data/tac_scribe.gemspec

@@ -43,6 +43,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'haversine', '~>0.3'
   spec.add_dependency 'sequel-postgis-georuby', '0.1.2'
   spec.add_dependency 'tacview_client', '~>0.1'
+  spec.add_dependency 'cinc', '~>0.1'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tac_scribe
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.3
 platform: java
 authors:
 - Jeffrey Jones
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  name: cinc
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: