Merge pull request #175 from knuton/drop-label-printer

Remove unused label printer page

controller/Changelog.md

@@ -4,6 +4,10 @@
 
 - controller: Enable spatial navigation using the arrow keys
 
+## Removed
+
+- controller: Remove unused label printing functionality
+
 # [2024.7.0] - 2024-08-02
 
 # [2024.7.0-VALIDATION] - 2024-07-02

controller/gui/style.css

@@ -454,12 +454,6 @@ html {
     overflow: auto;
 }
 
-.d-HiddenLink {
-    text-decoration: none;
-    cursor: text;
-    color: black;
-}
-
 .d-Code {
     font-style: normal;
     background-color: #F1F1F1;

controller/server/dune

@@ -4,12 +4,12 @@
  (name server)
  (public_name playos-controller)
  (modules server update info gui health
-   info_page localization_page status_page error_page label_page
+   info_page localization_page status_page error_page
    network_list_page network_details_page changelog_page
    page definition icon)
  (libraries lwt logs logs.fmt logs.lwt fpath cohttp-lwt-unix logging
   opium tyxml rauc zerotier connman locale network timedate systemd
-  label_printer semver2 fieldslib screen_settings)
+  semver2 fieldslib screen_settings)
  (preprocess (pps lwt_ppx ppx_sexp_conv)))
 
 (library

controller/server/gui.ml

@@ -395,62 +395,6 @@ module NetworkGui = struct
 end
 
 
-(** Label printing *)
-module LabelGui = struct
-  open Label_printer
-
-  let make_label () =
-    let%lwt ethernet_interfaces =
-      Network.Interface.get_all ()
-      >|= List.filter (fun (i: Network.Interface.t) ->
-          Re.execp (Re.seq [Re.start; Re.str "enp" ] |> Re.compile) i.name)
-    in
-    let%lwt server_info = Info.get () in
-    return
-      ({ machine_id = server_info.machine_id
-       ; mac_1 = CCOption.(
-             ethernet_interfaces
-             |> CCList.get_at_idx 0
-             >|= (fun i -> i.address)
-             |> get_or ~default:"-"
-           )
-       ; mac_2 = CCOption.(
-             ethernet_interfaces
-             |> CCList.get_at_idx 1
-             >|= (fun i -> i.address)
-             |> get_or ~default:"-"
-           )
-       } : Label_printer.label)
-
-  let overview _req =
-    let%lwt label = make_label () in
-    Lwt.return (page (Label_page.html label))
-
-  let print req =
-    let%lwt form_data = urlencoded_pairs_of_body req in
-    let url = form_data
-              |> List.assoc "label_printer_url"
-              |> List.hd
-    in
-    let count = form_data
-                |> List.assoc "count"
-                |> List.hd
-                |> int_of_string
-    in
-    let%lwt label = make_label () in
-    CCList.replicate count ()
-    |> Lwt_list.iter_s
-      (fun () -> Label_printer.print ~url label)
-    >|= (fun () -> "Labels printed.")
-    >|= success
-
-  let build app =
-    app
-    |> get "/label" overview
-    |> post "/label/print" print
-
-end
-
 module StatusGui = struct
   let build ~health_s ~update_s ~rauc app =
     app
@@ -537,7 +481,6 @@ let routes ~systemd ~shutdown ~health_s ~update_s ~rauc ~connman app =
   |> InfoGui.build
   |> NetworkGui.build ~connman
   |> LocalizationGui.build
-  |> LabelGui.build
   |> StatusGui.build ~health_s ~update_s ~rauc
   |> ChangelogGui.build
   |> RemoteMaintenanceGui.build ~systemd

controller/server/view/status_page.ml

@@ -16,12 +16,7 @@ let html { health; update; rauc } =
     ~current_page:Page.SystemStatus 
     ~header:(Page.header_title 
       ~icon:Icon.screen 
-      [ txt "System Statu"
-      ; a
-          ~a:[ a_class [ "d-HiddenLink" ]
-          ; a_href "/label"
-          ]
-          [ txt "s" ]
+      [ txt "System Status"
       ])
     (Definition.list
       (definition "Health" health