Delete lines that don't have contents

nerves-networking · May 9, 2019 · 3574006 · 3574006
1 parent 251cbff
commit 3574006
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/lib/vintage_net/technology/wifi.ex b/lib/vintage_net/technology/wifi.ex
@@ -4,6 +4,9 @@ defmodule VintageNet.Technology.WiFi do
   alias VintageNet.WiFi.{Scan, WPA2}
   alias VintageNet.Interface.RawConfig
 
+  # this is used to indicate that an entire line should be deleted from the final config.
+  @mark_for_deletion "MARK_FOR_DELETION"
+
   @impl true
   def to_raw_config(ifname, %{type: __MODULE__, wifi: wifi_config} = config, opts) do
     ifup = Keyword.fetch!(opts, :bin_ifup)
@@ -94,10 +97,13 @@ defmodule VintageNet.Technology.WiFi do
   end
 
   defp wifi_to_supplicant_contents(wifi, control_interface_path, regulatory_domain) do
-    """
-    ctrl_interface=#{control_interface_path}
-    country=#{regulatory_domain}
-    """ <> into_wifi_network_config(wifi)
+    content =
+      """
+      ctrl_interface=#{control_interface_path}
+      country=#{regulatory_domain}
+      """ <> into_wifi_network_config(wifi)
+
+    strip_marks(content)
   end
 
   defp key_mgmt_to_string(key) when key in [:none, :wep], do: "NONE"
@@ -153,7 +159,7 @@ defmodule VintageNet.Technology.WiFi do
 
   defp into_config_string(wifi, opt_key) do
     case Map.get(wifi, opt_key) do
-      nil -> ""
+      nil -> "#{@mark_for_deletion}"
       opt -> wifi_opt_to_config_string(wifi, opt_key, opt)
     end
   end
@@ -224,4 +230,11 @@ defmodule VintageNet.Technology.WiFi do
     {:ok, hostname} = :inet.gethostname()
     to_string(hostname)
   end
+
+  defp strip_marks(data) do
+    data
+    |> String.split("\n")
+    |> Enum.reject(&String.match?(&1, ~r(#{@mark_for_deletion})))
+    |> Enum.join("\n")
+  end
 end
diff --git a/test/vintage_net/config_wifi_test.exs b/test/vintage_net/config_wifi_test.exs
@@ -33,8 +33,6 @@ defmodule VintageNet.ConfigWiFiTest do
          ssid="testing"
          psk=1234567890123456789012345678901234567890123456789012345678901234
          key_mgmt=WPA-PSK
-
-
          }
          """}
       ],
@@ -81,8 +79,6 @@ defmodule VintageNet.ConfigWiFiTest do
          ssid="testing"
          psk=1EE0A473A954F61007E526365D4FDC056FE2A102ED2CE77D64492A9495B83030
          key_mgmt=WPA-PSK
-
-
          }
          """}
       ],
@@ -126,10 +122,7 @@ defmodule VintageNet.ConfigWiFiTest do
          country=00
          network={
          ssid="testing"
-
          key_mgmt=NONE
-
-
          }
          """}
       ],
@@ -225,7 +218,6 @@ defmodule VintageNet.ConfigWiFiTest do
          psk=1234567890123456789012345678901234567890123456789012345678901234
          key_mgmt=WPA-PSK
          scan_ssid=1
-
          }
          """}
       ],
@@ -244,7 +236,7 @@ defmodule VintageNet.ConfigWiFiTest do
     assert {:ok, output} == WiFi.to_raw_config("wlan0", input, default_opts())
   end
 
-  test "create a EAP network" do
+  test "create a basic EAP network" do
     input = %{
       type: VintageNet.Technology.WiFi,
       wifi: %{
@@ -279,7 +271,6 @@ defmodule VintageNet.ConfigWiFiTest do
            ssid="testing"
            key_mgmt=WPA-EAP
            scan_ssid=1
-           
            pairwise=CCMP TKIP
            group=CCMP TKIP
            eap=PEAP
@@ -352,21 +343,18 @@ defmodule VintageNet.ConfigWiFiTest do
          ssid="first_priority"
          psk=1234567890123456789012345678901234567890123456789012345678901234
          key_mgmt=WPA-PSK
-
          priority=100
          }
          network={
          ssid="second_priority"
          psk=1234567890123456789012345678901234567890123456789012345678901234
          key_mgmt=WPA-PSK
-
          priority=1
          }
          network={
          ssid="third_priority"
          psk=1234567890123456789012345678901234567890123456789012345678901234
          key_mgmt=NONE
-
          priority=0
          }
          """}