git rebase and fix conflicts

Author: Taras Tyshko

lib/nerves_hub/firmwares/update_tool/fwup.ex

@@ -209,7 +209,7 @@ defmodule NervesHub.Firmwares.UpdateTool.Fwup do
   defp update_changed_files(file_list, delta_zip_path, output_work_dir) do
     for file <- file_list do
       args = ["-9", delta_zip_path, String.replace_prefix(file, "#{output_work_dir}/", "")]
-      {_output, 0} = System.cmd("zip", args, cd: output_work_dir)
+      {_output, 0} = System.cmd("zip", args, cd: output_work_dir, env: %{})
     end
 
     :ok
@@ -234,38 +234,14 @@ defmodule NervesHub.Firmwares.UpdateTool.Fwup do
 
       case File.stat(source_filepath) do
         {:ok, %{size: f_source_size}} ->
-          args = [
-            "-A",
-            "-S",
-            "-f",
-            "-s",
-            source_filepath,
-            target_filepath,
-            output_path
-          ]
-
+          args = ["-A", "-S", "-f", "-s", source_filepath, target_filepath, output_path]
           %{size: f_target_size} = File.stat!(target_filepath)
 
           if f_target_size < @delta_overhead_limit do
             Logger.info("Skipping generating delta for #{path} it is under 22 bytes.")
             nil
           else
-            {_, 0} = System.cmd("xdelta3", args, stderr_to_stdout: true, env: [])
-            %{size: f_delta_size} = File.stat!(output_path)
-
-            if f_delta_size < f_target_size do
-              Logger.info(
-                "Generated delta for #{path}, from #{Float.round(f_source_size / 1024 / 1024, 1)} MB to #{Float.round(f_target_size / 1024 / 1024, 1)} MB via delta of #{Float.round(f_delta_size / 1024 / 1024, 1)} MB"
-              )
-
-              output_path
-            else
-              Logger.info(
-                "Skipping generated delta for #{path}, delta is larger: #{Float.round(f_source_size / 1024 / 1024, 1)} MB to #{Float.round(f_target_size / 1024 / 1024, 1)} MB via delta of #{Float.round(f_delta_size / 1024 / 1024, 1)} MB"
-              )
-
-              nil
-            end
+            generate_and_validate_delta(path, args, output_path, f_source_size, f_target_size)
           end
 
         {:error, :enoent} ->
@@ -276,11 +252,28 @@ defmodule NervesHub.Firmwares.UpdateTool.Fwup do
     end
   end
 
+  defp generate_and_validate_delta(path, args, output_path, f_source_size, f_target_size) do
+    {_, 0} = System.cmd("xdelta3", args, stderr_to_stdout: true, env: %{})
+    %{size: f_delta_size} = File.stat!(output_path)
+
+    if f_delta_size < f_target_size do
+      Logger.info(
+        "Generated delta for #{path}, from #{Float.round(f_source_size / 1024 / 1024, 1)} MB to #{Float.round(f_target_size / 1024 / 1024, 1)} MB via delta of #{Float.round(f_delta_size / 1024 / 1024, 1)} MB"
+      )
+
+      output_path
+    else
+      Logger.info(
+        "Skipping generated delta for #{path}, delta is larger: #{Float.round(f_source_size / 1024 / 1024, 1)} MB to #{Float.round(f_target_size / 1024 / 1024, 1)} MB via delta of #{Float.round(f_delta_size / 1024 / 1024, 1)} MB"
+      )
+
+      nil
+    end
+  end
+
   defp delta_files(deltas) do
     deltas
-    |> Enum.flat_map(fn {_k, files} ->
-      files
-    end)
+    |> Enum.flat_map(fn {_k, files} -> files end)
     |> Enum.uniq()
     |> case do
       [] -> {:error, :no_delta_support_in_firmware}

lib/nerves_hub_web/components/core_components.ex

@@ -331,7 +331,7 @@ defmodule NervesHubWeb.CoreComponents do
                range radio search select tel text textarea time url week)
   )
 
-  attr(:field, HTML.FormField,    doc: "a form field struct retrieved from the form, for example: @form[:email]"  )
+  attr(:field, HTML.FormField, doc: "a form field struct retrieved from the form, for example: @form[:email]")
 
   attr(:errors, :list, default: [])
   attr(:checked, :boolean, doc: "the checked flag for checkbox inputs")