Added SkipWeatherData flag

* Fix for #42
opensatelliteproject · May 13, 2017 · 96e4e1a · 96e4e1a
1 parent e3569cb
commit 96e4e1a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 2 deletions.
diff --git a/goesdump/GoesDecoder/FileHandler.cs b/goesdump/GoesDecoder/FileHandler.cs
@@ -14,13 +14,15 @@ public static class FileHandler {
 
         public static bool SkipDCS { get; set; }
         public static bool SkipEMWIN { get; set; }
+        public static bool SkipWeatherData { get; set; }
 
 
         static FileHandler() {
             byProductIdHandler = new Dictionary<int, FileHandlerFunction>();
             byCompressionTypeHandler = new Dictionary<int, FileHandlerFunction>();
             SkipDCS = false;
             SkipEMWIN = false;
+            SkipWeatherData = false;
         }
 
         public static void AttachByCompressionHandler(int compressionType, FileHandlerFunction handler) {
@@ -53,7 +55,8 @@ public static void DefaultHandler(string filename, XRITHeader fileHeader) {
             if (
                 (fileHeader.Product.ID == (int)NOAAProductID.DCS && SkipDCS) || 
                 (fileHeader.Product.ID == (int)NOAAProductID.EMWIN && SkipEMWIN) || 
-                (fileHeader.Product.ID == (int)NOAAProductID.HRIT_EMWIN && SkipEMWIN)
+                (fileHeader.Product.ID == (int)NOAAProductID.HRIT_EMWIN && SkipEMWIN) ||
+                (fileHeader.Product.ID == (int)NOAAProductID.WEATHER_DATA && SkipWeatherData)
             ) {
                 try {
                     File.Delete(filename);

diff --git a/goesdump/GoesDecoder/PacketManager.cs b/goesdump/GoesDecoder/PacketManager.cs
@@ -375,7 +375,10 @@ public static string DumpFile(string filename, XRITHeader fileHeader, string new
             string f = FixFileFolder(dir, fileHeader.Filename, fileHeader.Product, fileHeader.SubProduct);
             f = f.Replace(".lrit", "." + newExt);
 
-            if (FileHandler.SkipEMWIN && fileHeader.Product.ID == (int)NOAAProductID.HRIT_EMWIN) {
+            if (
+                FileHandler.SkipEMWIN && fileHeader.Product.ID == (int)NOAAProductID.HRIT_EMWIN ||
+                FileHandler.SkipWeatherData && f.Contains(WeatherDataFolder)
+            )  {
                 try {
                     File.Delete(filename);
                 } catch (Exception) {

diff --git a/goesdump/HeadlessMain.cs b/goesdump/HeadlessMain.cs
@@ -75,11 +75,13 @@ public HeadlessMain() {
             config.SysLogServer = config.SysLogServer;
             config.SysLogFacility = config.SysLogFacility;
             config.UseNOAAFormat = config.UseNOAAFormat;
+            config.EnableWeatherData = config.EnableWeatherData;
             config.Save();
             #endregion
 
             FileHandler.SkipEMWIN = !config.EnableEMWIN;
             FileHandler.SkipDCS = !config.EnableDCS;
+            FileHandler.SkipWeatherData = !config.EnableWeatherData;
             ImageManager.EraseFiles = config.EraseFilesAfterGeneratingFalseColor;
             ImageManager.GenerateInfrared = config.GenerateInfraredImages;
             ImageManager.GenerateVisible = config.GenerateVisibleImages;

diff --git a/goesdump/Main.cs b/goesdump/Main.cs
@@ -70,6 +70,7 @@ public Main() {
             config.SysLogServer = config.SysLogServer;
             config.SysLogFacility = config.SysLogFacility;
             config.UseNOAAFormat = config.UseNOAAFormat;
+            config.EnableWeatherData = config.EnableWeatherData;
             config.Save();
             #endregion
 
@@ -86,6 +87,7 @@ public Main() {
 
             FileHandler.SkipEMWIN = !config.EnableEMWIN;
             FileHandler.SkipDCS = !config.EnableDCS;
+            FileHandler.SkipWeatherData = !config.EnableWeatherData;
             ImageManager.EraseFiles = config.EraseFilesAfterGeneratingFalseColor;
             ImageManager.GenerateInfrared = config.GenerateInfraredImages;
             ImageManager.GenerateVisible = config.GenerateVisibleImages;

diff --git a/goesdump/Models/ProgConfig.cs b/goesdump/Models/ProgConfig.cs
@@ -138,6 +138,7 @@ public bool UseNOAAFormat {
             get { return (bool)this["UseNOAAFormat"]; }
             set { this["UseNOAAFormat"] = value; }
         }
+
         #endregion
 
         #region Packet Processing
@@ -154,6 +155,13 @@ public bool EnableEMWIN {
             get { return (bool)this["EnableEMWIN"]; }
             set { this["EnableEMWIN"] = value; }
         }
+
+        [UserScopedSettingAttribute()]
+        [DefaultSettingValueAttribute("true")]
+        public bool EnableWeatherData {
+            get { return (bool)this["EnableWeatherData"]; }
+            set { this["EnableWeatherData"] = value; }
+        }
         #endregion
 
         #region Syslog Configuration