Remove Site.{Source, Destination}; look in config

cmd/gojekyll/commands.go

@@ -22,7 +22,7 @@ import (
 var commandStartTime = time.Now()
 
 func buildCommand(site *sites.Site) error {
-	printPathSetting("Destination:", site.Destination)
+	printPathSetting("Destination:", site.DestDir())
 	printSetting("Generating...", "")
 	if buildOptions.DryRun {
 		buildOptions.Verbose = true
@@ -125,7 +125,7 @@ func renderCommand(site *sites.Site) error {
 	if err != nil {
 		return err
 	}
-	printPathSetting("Render:", filepath.Join(site.Source, p.SiteRelPath()))
+	printPathSetting("Render:", filepath.Join(site.SourceDir(), p.SiteRelPath()))
 	printSetting("URL:", p.Permalink())
 	printSetting("Content:", "")
 	return site.WriteDocument(p, os.Stdout)

cmd/gojekyll/main.go

@@ -93,19 +93,19 @@ func run(cmd string) error {
 
 // Load the site specified at destination into the site global, and print the common banner settings.
 func loadSite(source, destination string) (*sites.Site, error) {
-	site, err := sites.NewSiteFromDirectory(source)
+	if destination == defaultDestination {
+		destination = ""
+	}
+	site, err := sites.NewSiteFromDirectory(source, destination)
 	if err != nil {
 		return nil, err
 	}
-	if destination != "" && destination != defaultDestination {
-		site.Destination = destination
-	}
 	if site.ConfigFile != nil {
 		printPathSetting(configurationFileLabel, *site.ConfigFile)
 	} else {
 		printSetting(configurationFileLabel, "none")
 	}
-	printPathSetting("Source:", site.Source)
+	printPathSetting("Source:", site.SourceDir())
 	err = site.Load()
 	return site, err
 }

server/watcher.go

@@ -38,7 +38,7 @@ func (s *Server) watchFiles() error {
 			// remaps permalinks.
 			urls := map[string]bool{}
 			for _, filename := range filenames {
-				relpath, err := filepath.Rel(site.Source, filename)
+				relpath, err := filepath.Rel(site.SourceDir(), filename)
 				if err != nil {
 					log.Println("error:", err)
 					continue
@@ -57,7 +57,7 @@ func (s *Server) watchFiles() error {
 		}
 	}()
 
-	return watcher.Add(site.Source)
+	return watcher.Add(site.SourceDir())
 }
 
 // debounce relays values from input to output, merging successive values within interval

sites/build.go

@@ -37,10 +37,10 @@ func (s *Site) Clean(options BuildOptions) error {
 			return os.Remove(name)
 		}
 	}
-	if err := filepath.Walk(s.Destination, removeFiles); err != nil {
+	if err := filepath.Walk(s.DestDir(), removeFiles); err != nil {
 		return err
 	}
-	return helpers.RemoveEmptyDirectories(s.Destination)
+	return helpers.RemoveEmptyDirectories(s.DestDir())
 }
 
 // Build cleans the destination and create files in it.

sites/data.go

@@ -11,7 +11,7 @@ import (
 
 func (s *Site) readDataFiles() error {
 	s.data = map[string]interface{}{}
-	dataDir := filepath.Join(s.Source, s.config.DataDir)
+	dataDir := filepath.Join(s.SourceDir(), s.config.DataDir)
 	files, err := ioutil.ReadDir(dataDir)
 	if err != nil {
 		if os.IsNotExist(err) {

sites/load.go

@@ -12,7 +12,7 @@ import (
 )
 
 // NewSiteFromDirectory reads the configuration file, if it exists.
-func NewSiteFromDirectory(source string) (*Site, error) {
+func NewSiteFromDirectory(source, destination string) (*Site, error) {
 	s := NewSite()
 	configPath := filepath.Join(source, "_config.yml")
 	bytes, err := ioutil.ReadFile(configPath)
@@ -26,10 +26,12 @@ func NewSiteFromDirectory(source string) (*Site, error) {
 		if err != nil {
 			return nil, err
 		}
-		s.Source = filepath.Join(source, s.config.Source)
 		s.ConfigFile = &configPath
 	}
-	s.Destination = filepath.Join(s.Source, s.config.Destination)
+	s.config.Source = source
+	if destination != "" {
+		s.config.Destination = destination
+	}
 	return s, nil
 }
 
@@ -44,14 +46,13 @@ func (s *Site) Load() error {
 // Reload reloads the config file and pages.
 // If there's an error loading the config file, it has no effect.
 func (s *Site) Reload() error {
-	copy, err := NewSiteFromDirectory(s.Source)
+	copy, err := NewSiteFromDirectory(s.SourceDir(), s.config.Destination)
+	// TODO re-apply site load settings
 	if err != nil {
 		return err
 	}
-	copy.Destination = s.Destination
+	copy.config.Destination = s.config.Destination
 	*s = *copy
-	s.pipeline = nil
-	s.preparedToRender = false
 	return s.Load()
 }
 
@@ -64,7 +65,7 @@ func (s *Site) readFiles() error {
 			return err
 		}
 
-		relname, err := filepath.Rel(s.Source, filename)
+		relname, err := filepath.Rel(s.SourceDir(), filename)
 		if err != nil {
 			panic(err)
 		}
@@ -83,7 +84,7 @@ func (s *Site) readFiles() error {
 		return nil
 	}
 
-	if err := filepath.Walk(s.Source, walkFn); err != nil {
+	if err := filepath.Walk(s.SourceDir(), walkFn); err != nil {
 		return err
 	}
 	return s.ReadCollections()
@@ -105,7 +106,7 @@ func (s *Site) ReadCollections() error {
 	for name, data := range s.config.Collections {
 		c := collections.NewCollection(name, data, s)
 		s.Collections = append(s.Collections, c)
-		if err := c.ReadPages(s.Source, s.config.GetFrontMatterDefaults); err != nil {
+		if err := c.ReadPages(s.SourceDir(), s.config.GetFrontMatterDefaults); err != nil {
 			return err
 		}
 		for _, p := range c.Pages() {

sites/site.go

@@ -18,9 +18,6 @@ import (
 // Site is a Jekyll site.
 type Site struct {
 	ConfigFile  *string
-	Source      string
-	Destination string
-
 	Collections []*collections.Collection
 	// Variables   templates.VariableMap
 	Routes map[string]pages.Document // URL path -> Page, only for output pages
@@ -33,6 +30,15 @@ type Site struct {
 	siteVariables    templates.VariableMap
 }
 
+func (s *Site) SourceDir() string { return s.config.Source }
+
+func (s *Site) DestDir() string {
+	if filepath.IsAbs(s.config.Destination) {
+		return s.config.Destination
+	}
+	return filepath.Join(s.config.Source, s.config.Destination)
+}
+
 // OutputPages returns a list of output pages.
 func (s *Site) OutputPages() []pages.Document {
 	out := make([]pages.Document, 0, len(s.Routes))
@@ -116,7 +122,6 @@ func (c pluginContext) TemplateEngine() liquid.Engine { return c.engine }
 // initializeRenderingPipeline initializes the rendering pipeline
 func (s *Site) initializeRenderingPipeline() (err error) {
 	options := pipelines.PipelineOptions{
-		SourceDir:             s.Source,
 		RelativeFilenameToURL: s.RelativeFilenameToURL,
 	}
 	s.pipeline, err = pipelines.NewPipeline(s.config, options)

sites/write.go

@@ -49,8 +49,8 @@ func (s *Site) WritePages(options BuildOptions) (count int, err error) {
 // WritePage writes a page to the destination directory.
 // It attends to options.dry_run.
 func (s *Site) WritePage(p pages.Document, options BuildOptions) error {
-	from := filepath.Join(s.Source, filepath.ToSlash(p.SiteRelPath()))
-	to := filepath.Join(s.Destination, p.Permalink())
+	from := filepath.Join(s.SourceDir(), filepath.ToSlash(p.SiteRelPath()))
+	to := filepath.Join(s.DestDir(), p.Permalink())
 	if !p.Static() && filepath.Ext(to) == "" {
 		to = filepath.Join(to, "index.html")
 	}