General refactoring

pkg/hoarder/cid_source.go

@@ -1,8 +1,12 @@
 package hoarder
 
 import (
+	"bufio"
 	"math/rand"
+	"os"
+	"strings"
 
+	"github.com/cortze/ipfs-cid-hoarder/pkg/config"
 	"github.com/ipfs/go-cid"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
@@ -67,9 +71,31 @@ func (bitswap_cid_source *BitswapCIDSource) Type() string {
 	return "bitswap"
 }
 
-func read_content_from_file() ([]byte, cid.Cid, error) {
+//Reads CID and content from a given file. Starting idea for the file format should be CID CONTENT([]byte array)\n.
+func read_content_from_file(conf *config.Config) ([]byte, cid.Cid, error) {
+	filename := conf.CidFile
+	file, err := os.Open(filename)
+	defer file.Close()
+	if err != nil {
+		return nil, cid.Undef, errors.Wrap(err, "opening CID file")
+	}
+
+	scanner := bufio.NewScanner(file)
+	scanner.Split(bufio.ScanLines)
+	cid_and_contents := make(map[string]string)
+	for scanner.Scan() {
+		temp := strings.Fields(scanner.Text())
+		key := temp[0]
+		cid_and_contents[key] = cid_and_contents[temp[1]]
+	}
+
+	for cid, contents := range cid_and_contents {
+		//TODO check formatting and content
+
+	}
+}
 
-	//configure the type of CID that we support
+func return_cid_and_content(conf *config.Config) {
 
 }
 
@@ -80,6 +106,7 @@ func genRandomContent(byteLen int) ([]byte, cid.Cid, error) {
 	content := make([]byte, byteLen)
 	rand.Read(content)
 
+	//TODO do we have to have different CID types?
 	// configure the type of CID that we want
 	pref := cid.Prefix{
 		Version:  1,

pkg/hoarder/hoarder.go

@@ -124,7 +124,7 @@ func (c *CidHoarder) Run() error {
 	return nil
 }
 
-//Generates the cid source given a specific config file. E.g. a randomly generated cid source uses the Random_Cid_Gen struct, this function must return that.
+//Generates the cid source given a specific config struct. E.g. a randomly generated cid source uses the Random_Cid_Gen struct, this function must return that.
 //The options for the cid source are defined in this enum like const value.
 //
 //  const (