mirror of
https://codeberg.org/hyperreal/hyperfocus
synced 2024-11-01 16:53:11 +01:00
Fix file exists bug in listDistractors
This commit is contained in:
parent
985e3d080b
commit
d7d69b907a
@ -12,6 +12,13 @@ This is a Go implementation of the Python-written [concentration](https://github
|
|||||||
go install codeberg.org/hyperreal/hyperfocus@latest
|
go install codeberg.org/hyperreal/hyperfocus@latest
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Move the binary to a path where sudo can find it. E.g.:
|
||||||
|
|
||||||
|
``` bash
|
||||||
|
cd ~/go/bin
|
||||||
|
sudo cp -v hyperfocus /usr/local/bin
|
||||||
|
```
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
71
main.go
71
main.go
@ -213,45 +213,54 @@ func takeBreak(minutes int) {
|
|||||||
|
|
||||||
// Prints the current list of distractors to be blocked
|
// Prints the current list of distractors to be blocked
|
||||||
// If neither /etc/hf_distractors nor /etc/hf_predef_distractors exist,
|
// If neither /etc/hf_distractors nor /etc/hf_predef_distractors exist,
|
||||||
// print error message to console but do not exit.
|
// print error message to console and exit.
|
||||||
func listDistractors() {
|
func listDistractors() {
|
||||||
|
|
||||||
// Open /etc/hf_distractors and store it as *os.File type
|
if !fileExists(localFilePaths["uDistractors"]) && !fileExists(localFilePaths["pDistractors"]) {
|
||||||
userDistractorsFileObj, err := os.Open(localFilePaths["uDistractors"])
|
fmt.Printf("%s not found\n", localFilePaths["uDistractors"])
|
||||||
if err != nil {
|
fmt.Printf("%s not found\n", localFilePaths["pDistractors"])
|
||||||
fmt.Println(err)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
defer func() {
|
|
||||||
if err := userDistractorsFileObj.Close(); err != nil {
|
if fileExists(localFilePaths["uDistractors"]) {
|
||||||
fmt.Printf("Error closing file: %s\n", err)
|
// Open /etc/hf_distractors and store it as *os.File type
|
||||||
|
userDistractorsFileObj, err := os.Open(localFilePaths["uDistractors"])
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println(err)
|
||||||
}
|
}
|
||||||
}()
|
defer func() {
|
||||||
|
if err := userDistractorsFileObj.Close(); err != nil {
|
||||||
|
fmt.Printf("Error closing file: %s\n", err)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
// Initialize a new scanner, scan /etc/hf_distractors, and print to
|
// Initialize a new scanner, scan /etc/hf_distractors, and print to
|
||||||
// stdout line by line.
|
// stdout line by line.
|
||||||
scanner := bufio.NewScanner(userDistractorsFileObj)
|
scanner := bufio.NewScanner(userDistractorsFileObj)
|
||||||
for scanner.Scan() {
|
for scanner.Scan() {
|
||||||
fmt.Println(scanner.Text())
|
fmt.Println(scanner.Text())
|
||||||
}
|
|
||||||
|
|
||||||
// Open /etc/hf_predef_distractors and store it as *os.File type
|
|
||||||
predefDistractorsFileObj, err := os.Open(localFilePaths["pDistractors"])
|
|
||||||
if err != nil {
|
|
||||||
fmt.Println(err)
|
|
||||||
}
|
|
||||||
defer func() {
|
|
||||||
if err := predefDistractorsFileObj.Close(); err != nil {
|
|
||||||
fmt.Printf("Error closing file: %s\n", err)
|
|
||||||
}
|
}
|
||||||
}()
|
|
||||||
|
|
||||||
// Initialize a new scanner, scan /etc/hf_predef_distractors, and print to
|
|
||||||
// stdout line by line.
|
|
||||||
scanner = bufio.NewScanner(predefDistractorsFileObj)
|
|
||||||
for scanner.Scan() {
|
|
||||||
fmt.Println(scanner.Text())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if fileExists(localFilePaths["pDistractors"]) {
|
||||||
|
// Open /etc/hf_predef_distractors and store it as *os.File type
|
||||||
|
predefDistractorsFileObj, err := os.Open(localFilePaths["pDistractors"])
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println(err)
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
if err := predefDistractorsFileObj.Close(); err != nil {
|
||||||
|
fmt.Printf("Error closing file: %s\n", err)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Initialize a new scanner, scan /etc/hf_predef_distractors, and print to
|
||||||
|
// stdout line by line.
|
||||||
|
scanner := bufio.NewScanner(predefDistractorsFileObj)
|
||||||
|
for scanner.Scan() {
|
||||||
|
fmt.Println(scanner.Text())
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Adds predefined distractors to /etc/hf_predef_distractors file
|
// Adds predefined distractors to /etc/hf_predef_distractors file
|
||||||
|
Loading…
Reference in New Issue
Block a user