From bea32af5d45702e5608d347bf2bf6314d899f2e0 Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Sat, 12 Jan 2019 18:18:23 +0100 Subject: [feat] Reorganize code Let's use a more structured folder system: https://github.com/golang-standards/project-layout - Resolves: #99 --- pkg/systray/run.go | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 pkg/systray/run.go (limited to 'pkg/systray/run.go') diff --git a/pkg/systray/run.go b/pkg/systray/run.go new file mode 100644 index 0000000..0457ed4 --- /dev/null +++ b/pkg/systray/run.go @@ -0,0 +1,103 @@ +// Copyright (C) 2018 LEAP +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +package systray + +import ( + "log" + "os" + + "0xacab.org/leap/bitmask-systray/pkg/bitmask" + "0xacab.org/leap/bitmask-systray/pkg/config" +) + +func Run(conf *SystrayConfig) { + bt := bmTray{conf: conf} + go initialize(conf, &bt) + bt.start() +} + +func initialize(conf *SystrayConfig, bt *bmTray) { + if _, err := os.Stat(config.Path); os.IsNotExist(err) { + os.MkdirAll(config.Path, os.ModePerm) + } + + err := acquirePID() + if err != nil { + log.Fatal(err) + } + defer releasePID() + + notify := newNotificator(conf) + + b, err := bitmask.Init(conf.Printer) + if err != nil { + notify.initFailure(err) + return + } + defer b.Close() + go checkAndStartBitmask(b, notify, conf) + go listenSignals(b) + + as := bitmask.NewAutostart(conf.ApplicationName, getIconPath()) + err = as.Enable() + if err != nil { + log.Printf("Error enabling autostart: %v", err) + } + bt.loop(b, notify, as) +} + +func checkAndStartBitmask(b bitmask.Bitmask, notify *notificator, conf *SystrayConfig) { + err := checkAndInstallHelpers(b, notify) + if err != nil { + log.Printf("Is bitmask running? %v", err) + os.Exit(1) + } + err = maybeStartVPN(b, conf) + if err != nil { + log.Println("Error starting VPN: ", err) + notify.errorStartingVPN(err) + } +} + +func checkAndInstallHelpers(b bitmask.Bitmask, notify *notificator) error { + helpers, priviledge, err := b.VPNCheck() + if (err != nil && err.Error() == "nopolkit") || (err == nil && !priviledge) { + log.Printf("No polkit found") + notify.authAgent() + } else if err != nil { + log.Printf("Error checking vpn: %v", err) + notify.errorStartingVPN(err) + return err + } + + if !helpers { + err = b.InstallHelpers() + if err != nil { + log.Println("Error installing helpers: ", err) + } + } + return nil +} + +func maybeStartVPN(b bitmask.Bitmask, conf *SystrayConfig) error { + if conf.UserStoppedVPN { + return nil + } + + err := b.StartVPN(conf.Provider) + conf.setUserStoppedVPN(false) + return err +} -- cgit v1.2.3