From 5bbfc6e049df044141e3971e8b84308c3b00b074 Mon Sep 17 00:00:00 2001
From: handlerug <umar@handlerug.me>
Date: Wed, 28 Apr 2021 17:12:36 +0700
Subject: [PATCH] Fix config path resolver

---
 files/files.go | 25 +++++++++----------------
 main.go        |  6 ++++--
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/files/files.go b/files/files.go
index 0eeb69b..d54566b 100644
--- a/files/files.go
+++ b/files/files.go
@@ -2,24 +2,23 @@ package files
 
 import (
 	"errors"
-	"github.com/adrg/xdg"
-	"github.com/bouncepaw/mycorrhiza/util"
 	"log"
 	"path/filepath"
 	"strings"
+
+	"github.com/adrg/xdg"
+	"github.com/bouncepaw/mycorrhiza/util"
 )
 
 var paths struct {
 	tokensJSON                  string
 	registrationCredentialsJSON string
 	fixedCredentialsJSON        string
-	configINI                   string
 }
 
 func TokensJSON() string                  { return paths.tokensJSON }
 func RegistrationCredentialsJSON() string { return paths.registrationCredentialsJSON }
 func FixedCredentialsJSON() string        { return paths.fixedCredentialsJSON }
-func ConfigINI() string                   { return paths.configINI }
 
 // CalculatePaths looks for all external paths and stores them. Tries its best to find any errors. It is safe it to call it multiple times in order to save new paths.
 func CalculatePaths() error {
@@ -38,13 +37,7 @@ func CalculatePaths() error {
 	if dir, err := fixedCredentialsPath(); err != nil {
 		return err
 	} else {
-		paths.tokensJSON = dir
-	}
-
-	if dir, err := configPath(); err != nil {
-		return err
-	} else {
-		paths.configINI = dir
+		paths.fixedCredentialsJSON = dir
 	}
 
 	return nil
@@ -79,11 +72,11 @@ func registrationCredentialsPath() (string, error) {
 }
 
 func fixedCredentialsPath() (string, error) {
-	path, err := filepath.Abs(util.FixedCredentialsPath)
-	return path, err
-}
+	var err error
+	var path = ""
 
-func configPath() (string, error) {
-	path, err := filepath.Abs(util.ConfigFilePath)
+	if len(util.FixedCredentialsPath) > 0 {
+		path, err = filepath.Abs(util.FixedCredentialsPath)
+	}
 	return path, err
 }
diff --git a/main.go b/main.go
index cb05d60..295c974 100644
--- a/main.go
+++ b/main.go
@@ -179,11 +179,13 @@ Crawl-delay: 5`))
 
 func main() {
 	parseCliArgs()
+
+	// It is ok if the path is ""
+	util.ReadConfigFile(util.ConfigFilePath)
+
 	if err := files.CalculatePaths(); err != nil {
 		log.Fatal(err)
 	}
-	// It is ok if the path is ""
-	util.ReadConfigFile(files.ConfigINI())
 
 	log.Println("Running MycorrhizaWiki")
 	if err := os.Chdir(WikiDir); err != nil {