Первая версия (CLI-only) #1

Merged
weirdcat merged 26 commits from develop into main 2025-11-27 13:09:27 +03:00
6 changed files with 25 additions and 20 deletions
Showing only changes of commit 0fed9a2681 - Show all commits

View File

@@ -24,7 +24,7 @@ type browserLauncherImpl struct {
// OpenAuto implements BrowserLauncher. // OpenAuto implements BrowserLauncher.
func (b *browserLauncherImpl) OpenAuto(url string) error { func (b *browserLauncherImpl) OpenAuto(url string) error {
if (b.useCustomCommand) { if b.useCustomCommand {
return b.OpenCustom(url) return b.OpenCustom(url)
} else { } else {
return b.OpenDefault(url) return b.OpenDefault(url)
@@ -67,9 +67,9 @@ func NewBrowserLauncher(config *config.Config, log *logger.Logger) BrowserLaunch
useCustomCommand := config.App.UseCustomBrowserCommand useCustomCommand := config.App.UseCustomBrowserCommand
customCommand := config.App.BrowserOpenCommand customCommand := config.App.BrowserOpenCommand
return &browserLauncherImpl{ return &browserLauncherImpl{
config: config, config: config,
log: log, log: log,
useCustomCommand: useCustomCommand, useCustomCommand: useCustomCommand,
customCommand: customCommand, customCommand: customCommand,
} }
} }

View File

@@ -20,6 +20,6 @@
package constants package constants
const ( const (
AppName = "auto-attendance" AppName = "auto-attendance"
AppClassGtk = "su.weirdcat.autoattendance" AppClassGtk = "su.weirdcat.autoattendance"
) )

View File

@@ -82,7 +82,14 @@ func (q *qrminatorImpl) UpdateConfig(string) error {
panic("unimplemented") panic("unimplemented")
} }
func NewQrminator(cfg *config.Config, log *logger.Logger, capt screencapturer.ScreenCapturer, vis vision.Vision, val linkvalidator.LinkValidator, launch browserlauncher.BrowserLauncher) Qrminator { func NewQrminator(
cfg *config.Config,
log *logger.Logger,
capt screencapturer.ScreenCapturer,
vis vision.Vision,
val linkvalidator.LinkValidator,
launch browserlauncher.BrowserLauncher,
) Qrminator {
return &qrminatorImpl{ return &qrminatorImpl{
config: cfg, config: cfg,
log: log, log: log,

View File

@@ -51,8 +51,8 @@ type wholeScreenCapturer struct {
tempDirectory string tempDirectory string
initialized bool initialized bool
files []string files []string
mu sync.RWMutex mu sync.RWMutex
} }
// Get implements ScreenCapturer. // Get implements ScreenCapturer.

View File

@@ -19,18 +19,16 @@
package ui package ui
import ( import "github.com/gotk3/gotk3/gtk"
"github.com/gotk3/gotk3/gtk"
)
func NewBuilder() (*gtk.Builder, error) { func NewBuilder() (*gtk.Builder, error) {
gtk.Init(nil) gtk.Init(nil)
builder, err := gtk.BuilderNew() builder, err := gtk.BuilderNew()
if err != nil { if err != nil {
return nil, err return nil, err
} }
return builder, nil return builder, nil
} }

View File

@@ -26,12 +26,12 @@ import (
type MainWindow struct { type MainWindow struct {
builder *gtk.Builder builder *gtk.Builder
window *gtk.Window window *gtk.Window
} }
func (m *MainWindow) Start() { func (m *MainWindow) Start() {
m.window.ShowAll() m.window.ShowAll()
go func() { gtk.Main() }() go func() { gtk.Main() }()
} }
func NewMainWindow(builder *gtk.Builder) (*MainWindow, error) { func NewMainWindow(builder *gtk.Builder) (*MainWindow, error) {
@@ -45,7 +45,7 @@ func NewMainWindow(builder *gtk.Builder) (*MainWindow, error) {
return nil, err return nil, err
} }
window := windowObj.(*gtk.Window) window := windowObj.(*gtk.Window)
window.Connect("destroy", func () { window.Connect("destroy", func() {
gtk.MainQuit() gtk.MainQuit()
}) })