datv reporter tests, misc bugs

Author: tomvdb

ExtraFeatures/BATCWebchat/wbchat.cs

@@ -373,6 +373,8 @@ private void txtNick_Click(object sender, EventArgs e)
 
             nickDialog.txtNick.Text = txtNick.Text;
 
+            _settings.nickname = txtNick.Text;
+
             if (nickDialog.ShowDialog() == DialogResult.OK)
             {
                 txtNick.Text = nickDialog.txtNick.Text;
@@ -460,7 +462,7 @@ private void getSignalReportData(int tuner)
 
             signalReport = signalReport.Replace("{SN}", data["ServiceName"]);
             signalReport = signalReport.Replace("{SP}", data["ServiceProvider"]);
-            signalReport = signalReport.Replace("{DBM}", "D" + data["dbMargin"]);
+            signalReport = signalReport.Replace("{DBM}", data["dbMargin"]);
             signalReport = signalReport.Replace("{MER}", data["Mer"] + " dB");
             signalReport = signalReport.Replace("{SR}", data["SR"] + "");
             signalReport = signalReport.Replace("{FREQ}", data["Frequency"] + "");

ExtraFeatures/DATVReporter/DATVReporter.cs

@@ -8,6 +8,7 @@
 using System.Drawing.Printing;
 using Serilog;
 using opentuner.Utilities;
+using System.Timers;
 
 namespace opentuner.ExtraFeatures.DATVReporter
 {
@@ -18,7 +19,6 @@ public class DATVReporter
         private DATVReporterSettings _datv_reporter_settings;
         private SettingsManager<DATVReporterSettings> _settings_manager;
 
-
         private WebSocket _websocket;
 
         public bool Connected = false;
@@ -27,9 +27,11 @@ public class DATVReporter
         private TimeSpan _last_callsign_threshold = TimeSpan.FromSeconds(30);
         private DateTime _last_callsign_timestamp = DateTime.MinValue;
 
-        private TimeSpan _last_send_threshold = TimeSpan.FromSeconds(5);
+        private TimeSpan _last_send_threshold = TimeSpan.FromSeconds(10);
         private DateTime _last_send_timestamp = DateTime.MinValue;
-        
+
+        private static Timer _timer;
+
         public void ShowSettings()
         {
             _settings_form = new DATVReporterSettingsForm();
@@ -79,6 +81,19 @@ public DATVReporter()
             _settings_manager = new SettingsManager<DATVReporterSettings>("datvreporter_settings");
             _datv_reporter_settings = (_settings_manager.LoadSettings(_datv_reporter_settings));
 
+            _timer = new Timer(10000);
+
+            _timer.Elapsed += _timer_Elapsed;
+            _timer.Enabled = false;
+        }
+
+        private void _timer_Elapsed(object sender, ElapsedEventArgs e)
+        {
+            if ( !Connected )
+            {
+                Log.Warning("DATV Reporter : Attempt Reconnect");
+                Connect();
+            }
         }
 
         private void Debug(string msg)
@@ -113,6 +128,8 @@ public bool Connect()
                 Debug("Connecting: " + url);
 
                 _websocket = new WebSocket(url);
+                // _websocket.Log.Level = LogLevel.Trace;
+                _websocket.SslConfiguration.EnabledSslProtocols = System.Security.Authentication.SslProtocols.Tls12;
                 _websocket.OnClose += _websocket_OnClose;
                 _websocket.OnMessage += _websocket_OnMessage;
                 _websocket.OnOpen += _websocket_OnOpen;
@@ -183,6 +200,7 @@ private void _websocket_OnOpen(object sender, EventArgs e)
         {
             Debug("Connected ");
             Connected = true;
+            _timer.Enabled = true; // stay alive timer, only start when connected properly first time
         }
 
         private void _websocket_OnMessage(object sender, MessageEventArgs e)
@@ -192,6 +210,7 @@ private void _websocket_OnMessage(object sender, MessageEventArgs e)
 
         private void _websocket_OnClose(object sender, CloseEventArgs e)
         {
+            Log.Warning("DATV Reporter Disconnected");
             Connected = false;
         }
     }

ExtraFeatures/DATVReporter/ISawMessage.cs

@@ -18,15 +18,17 @@ public class ISawMessage
         public double mer;
         public long frequency;
         public int symbol_rate;
+        public string hardware;
 
-        public ISawMessage(string callsign, double db_margin, double mer, long frequency, int symbol_rate)
+        public ISawMessage(string callsign, double db_margin, double mer, long frequency, int symbol_rate, string hardware)
         {
             this.target_callsign = callsign;
             this.observed_time = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ssZ");
             this.db_margin = db_margin;
             this.mer = mer;
             this.frequency = frequency;
             this.symbol_rate = symbol_rate;
+            this.hardware = hardware;
         }
     }
 }

MainForm.Designer.cs

@@ -130,13 +130,11 @@ public MainForm()
             comboAvailableSources.SelectedIndex = _settings.default_source;
             sourceInfo.Text = _availableSources[_settings.default_source].GetDescription();
 
-
             // load stored presets
             frequenciesManager = new SettingsManager<List<StoredFrequency>>("frequency_presets");
             stored_frequencies = frequenciesManager.LoadSettings(stored_frequencies);
 
-
-            Text = "Open Tuner (ZR6TG) - Version " + GlobalDefines.Version + " - " + opentuner.Properties.Resources.BuildDate;
+            Text = "Open Tuner (ZR6TG) - Version " + GlobalDefines.Version + " - Build: " + opentuner.Properties.Resources.BuildDate;
         }
 
         /// <summary>
@@ -202,13 +200,24 @@ private void VideoSource_OnSourceData(int video_nr, OTSourceData properties, str
             {
                 if (properties.demod_locked)
                 {
-                    datv_reporter.SendISawMessage(new ISawMessage(
+                    bool result = datv_reporter.SendISawMessage(new ISawMessage(
                         properties.service_name,
                         properties.db_margin,
                         properties.mer,
                         properties.frequency,
-                        properties.symbol_rate
+                        properties.symbol_rate,
+                        videoSource.GetDeviceName()
                         ));
+
+                    /*
+                    if (!result)
+                    {
+                        if (!datv_reporter.Connected)
+                        {
+                            datv_reporter.Connect();
+                        }
+                    }
+                    */
                 }
             }
 
@@ -982,6 +991,11 @@ private void linkDATVReporterSettings_Click(object sender, EventArgs e)
         {
             datv_reporter.ShowSettings();
         }
+
+        private void checkDATVReporter_CheckedChanged(object sender, EventArgs e)
+        {
+            _settings.enable_datvreporter_checkbox = checkDATVReporter.Checked;
+        }
     }