Skip to content

Commit

Permalink
It's gotten pretty messy. Time to refactor
Browse files Browse the repository at this point in the history
	new file:   cmd/rfd/config/initialise.go
	new file:   cmd/rfd/global/parameters.go
	modified:   cmd/rfd/index.go
	deleted:    cmd/rfd/init.go
	modified:   cmd/rfd/new.go
	modified:   cmd/rfd/rfd.go
	renamed:    cmd/rfd/util.go -> cmd/rfd/util/utilities.go
	modified:   go.mod
  • Loading branch information
redazzo committed Jun 10, 2023
1 parent a83b242 commit 2fc3eba
Show file tree
Hide file tree
Showing 8 changed files with 647 additions and 653 deletions.
461 changes: 461 additions & 0 deletions cmd/rfd/config/initialise.go

Large diffs are not rendered by default.

36 changes: 36 additions & 0 deletions cmd/rfd/global/parameters.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package global

type Configuration struct {
RootDirectory string `yaml:"root-directory"`
TemplatesDirectory string `yaml:"templates-directory"`
//RFDRelativeDirectory string `yaml:"rfd-relative-directory"`
PrivateKeyFileName string `yaml:"private-key-file-name"`
InitialAuthor string `yaml:"initial-author"`
Organisation string `yaml:"organisation"`
InstigationDate string `yaml:"instigation-date"`
}

type States struct {
RFDStates []map[string]map[string]string `yaml:"rfd-states"`
}

type RFDMetadata struct {
RFDID string
Title string
Authors string
State string
Link string
RFDStates []map[string]map[string]string
}

const HOME string = "HOME"
const HOMEDRIVE string = "HOMEDRIVE"
const HOMEPATH string = "HOMEPATH"

var SSHDIR string
var REPO_TEMPLATE_FILE_LOCATION string
var TEMPLATE_FILE_LOCATION string
var PATH_SEPARATOR string

var APP_CONFIG *Configuration
var APP_STATES *States
44 changes: 23 additions & 21 deletions cmd/rfd/index.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ package main
import (
"bytes"
"fmt"
"github.com/redazzo/rfd/cmd/rfd/global"
"github.com/redazzo/rfd/cmd/rfd/util"
"io/ioutil"
"os"
"regexp"
Expand All @@ -14,7 +16,7 @@ import (

func Index() error {

logger.traceLog("Creating index file ...")
util.Logger.TraceLog("Creating index file ...")

// The entries to be read and written to the
// Markdown table file.
Expand All @@ -28,26 +30,26 @@ func Index() error {
entries := getDirectories()
for _, entry := range entries {

entryIsBranchID, err := isRFDIDFormat(entry.Name())
CheckFatal(err)
entryIsBranchID, err := util.IsRFDIDFormat(entry.Name())
util.CheckFatal(err)

if entryIsBranchID {

logger.traceLog("Matched " + entry.Name())
util.Logger.TraceLog("Matched " + entry.Name())

branchID := entry.Name()

if entry.IsDir() {

subEntries, err := ioutil.ReadDir(appConfig.RootDirectory + "/" + entry.Name())
CheckFatal(err)
subEntries, err := ioutil.ReadDir(global.APP_CONFIG.RootDirectory + "/" + entry.Name())
util.CheckFatal(err)

for _, subEntry := range subEntries {

if !subEntry.IsDir() {

isReadmeFile, err := regexp.MatchString(`(?i)^readme.md`, subEntry.Name())
CheckFatal(err)
util.CheckFatal(err)

if isReadmeFile {

Expand All @@ -70,21 +72,21 @@ func Index() error {
}

func getDirectories() []os.FileInfo {
entries, err := ioutil.ReadDir(appConfig.RootDirectory)
CheckFatal(err)
entries, err := ioutil.ReadDir(global.APP_CONFIG.RootDirectory)
util.CheckFatal(err)
return entries
}

func openMetadataTableFile() *os.File {
mdTableFile, err := os.Create(appConfig.RootDirectory + "/index.md")
CheckFatal(err)
mdTableFile, err := os.Create(global.APP_CONFIG.RootDirectory + "/index.md")
util.CheckFatal(err)

_, err = mdTableFile.WriteString("**Index of Requests for Discussion**\n\n")
CheckFatal(err)
util.CheckFatal(err)
_, err = mdTableFile.WriteString("| **RFD Id** | **Title** | **State** | **Author(s)** |\n")
CheckFatal(err)
util.CheckFatal(err)
_, err = mdTableFile.WriteString("|------------|-----------|-----------|------------------------|\n")
CheckFatal(err)
util.CheckFatal(err)
return mdTableFile
}

Expand All @@ -93,24 +95,24 @@ func writeMetadataToTableFile(metaData map[string]interface{}, mdTableFile *os.F
authors := fmt.Sprintf("%v", metaData["authors"])
state := fmt.Sprintf("%v", metaData["state"])

logger.traceLog(title + ":" + authors + ":" + state)
util.Logger.TraceLog(title + ":" + authors + ":" + state)

_, err := mdTableFile.WriteString("|[" + branchID + "](./" + branchID + "/readme.md)|" + title + "|" + state + "|" + authors + "|\n")
CheckFatal(err)
util.CheckFatal(err)

logger.traceLog("recorded: " + branchID)
logger.traceLog("----------------------------------------------")
util.Logger.TraceLog("recorded: " + branchID)
util.Logger.TraceLog("----------------------------------------------")
}

func readMetadataFromReadmeFile(subEntry os.FileInfo, entry os.FileInfo) map[string]interface{} {
logger.traceLog("Found " + appConfig.RootDirectory + "/" + entry.Name() + "/" + subEntry.Name())
util.Logger.TraceLog("Found " + global.APP_CONFIG.RootDirectory + "/" + entry.Name() + "/" + subEntry.Name())
markdown := goldmark.New(
goldmark.WithExtensions(
meta.Meta,
),
)
file, err := ioutil.ReadFile(appConfig.RootDirectory + "/" + entry.Name() + "/" + subEntry.Name())
CheckFatal(err)
file, err := os.ReadFile(global.APP_CONFIG.RootDirectory + "/" + entry.Name() + "/" + subEntry.Name())
util.CheckFatal(err)

var buf bytes.Buffer
context := parser.NewContext()
Expand Down
248 changes: 0 additions & 248 deletions cmd/rfd/init.go

This file was deleted.

Loading

0 comments on commit 2fc3eba

Please sign in to comment.