Do not repeat code whenever possible

Signed-off-by: Shin'ya Minazuki <shinyoukai@laidback.moe>
This commit is contained in:
2025-12-30 07:53:26 -03:00
parent 811028bebc
commit 60688d7a0e
3 changed files with 22 additions and 18 deletions

View File

@@ -2,6 +2,7 @@ package main
import (
"fmt"
"log"
"os"
"strings"
"syscall"
@@ -17,24 +18,22 @@ var (
)
func init() {
config, err := os.UserConfigDir()
if err != nil {
fmt.Println("Unable to obtain user's configuration directory")
os.Exit(1)
}
configPath := config + "/mikuru.ini"
mikuru.Parse(configPath)
mikuru.ConfInit()
}
func main() {
cli, err := client.NewClient(client.WithURI(mikuru.Config.Host))
if err != nil {
fmt.Printf("%s", err)
fmt.Println("Error creating client")
os.Exit(1)
log.Println("Unable to create client")
log.Fatal(err)
}
fmt.Println("Welcome to Mikuru!")
fmt.Printf("%s\n", mikuru.PrintVersion())
signin(cli)
}
func signin(cli *client.Client) {
fmt.Printf("Username: ")
fmt.Scanln(&username)

View File

@@ -2,7 +2,6 @@ package main
import (
"log"
"os"
"git.laidback.moe/shinyoukai/mikuru"
"go.yarn.social/client"
@@ -10,13 +9,7 @@ import (
)
func init() {
config, err := os.UserConfigDir()
if err != nil {
log.Fatalf("%s\n")
}
configPath := config + "/mikuru.ini"
mikuru.Parse(configPath)
mikuru.ConfInit()
}
func main() {

View File

@@ -1,6 +1,8 @@
package mikuru
import (
"log"
"os"
"gopkg.in/ini.v1"
)
@@ -9,6 +11,16 @@ var Config struct {
Token string
}
func ConfInit() {
config, err := os.UserConfigDir()
if err != nil {
log.Println("Unable to obtain user's configuration directory")
log.Fatal(err)
}
configPath := config + "/mikuru.ini"
Parse(configPath)
}
func Parse(file string) error {
cfg, err := ini.Load(file)
if err != nil {