Compare commits
5 Commits
useMyEngin
...
master
Author | SHA1 | Date | |
---|---|---|---|
f32bbd2ff1 | |||
43e145a6ec | |||
c887f2a0cc | |||
9f6dcac314 | |||
421e9b074e |
2
color.go
2
color.go
@@ -157,7 +157,7 @@ func stringToRGB(rgbString string) (*RGB, error) {
|
||||
func loadColorsFromFile(filepath string) error {
|
||||
data, err := os.ReadFile(filepath)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
return err
|
||||
}
|
||||
// Read color config file into a MapSlice
|
||||
tempMapSlice := yaml.MapSlice{}
|
||||
|
@@ -3,6 +3,7 @@ package main
|
||||
import (
|
||||
"embed"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io/fs"
|
||||
"os"
|
||||
"path/filepath"
|
||||
@@ -88,7 +89,10 @@ func loadConfig(configFilename string) (stack.Stack[regColor], error) {
|
||||
// returned.
|
||||
regColorStack := stack.NewStack[regColor](len(strings.Split(string(configFile), "\n"))) // The stack will have the same size as the number of lines in the file
|
||||
for _, item := range tempMapSlice {
|
||||
re := regex.MustCompile(item.Key.(string), regex.RE_MULTILINE, regex.RE_SINGLE_LINE)
|
||||
re, err := regex.Compile(item.Key.(string), regex.RE_MULTILINE, regex.RE_SINGLE_LINE)
|
||||
if err != nil {
|
||||
return *stack.NewStack[regColor](0), fmt.Errorf("%v: '%s'", err, item.Key.(string))
|
||||
}
|
||||
clr, err := newColor(item.Value.(string))
|
||||
if err != nil {
|
||||
return *stack.NewStack[regColor](0), err
|
||||
|
@@ -14,6 +14,8 @@
|
||||
|
||||
# Bold text
|
||||
'\b__[^_]+?__\b': BOLD_WHITE
|
||||
'\*\*[^*]+?\*\*': BOLD_WHITE
|
||||
|
||||
# Italic text
|
||||
'\b_[^_]+?_\b': ITALIC_WHITE
|
||||
'\*[^*\n]+?\*': ITALIC_WHITE
|
||||
|
4
main.go
4
main.go
@@ -79,7 +79,7 @@ func main() {
|
||||
// Check if config exists. If it doesn't, generate the config files.
|
||||
userHomeDir, err := os.UserHomeDir() // Get current user's home directory, to construct config path
|
||||
if err != nil {
|
||||
panic(err)
|
||||
printErrAndExit("Unable to retrieve user home directory")
|
||||
}
|
||||
configPath := filepath.Join(userHomeDir + "/.config/ccat/")
|
||||
if _, err := os.Stat(configPath); os.IsNotExist(err) {
|
||||
@@ -107,7 +107,7 @@ func main() {
|
||||
// the program.
|
||||
finfo, err := os.Stat(fileName)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
printErrAndExit("Unable to read file")
|
||||
}
|
||||
if finfo.Size() == 0 {
|
||||
os.Exit(0)
|
||||
|
Reference in New Issue
Block a user