return empty when not on filesystem closes #113

Author: cooper

quiki.go

@@ -113,34 +113,22 @@ func runPageAndExit(page *wikifier.Page) {
 	if err != nil {
 		log.Fatal(err)
 	}
-	printPageResultAndExit(page.RelPath(), page.HTML(), page.Warnings)
+	fmt.Println(page.HTML())
+	os.Exit(0)
 }
 
 // runs a wiki page
 func runWikiPageAndExit(w *wiki.Wiki, pagePath string) {
 	res := w.DisplayPage(pagePath)
 	switch r := res.(type) {
 	case wiki.DisplayPage:
-		printPageResultAndExit(r.Path, r.Content, r.Warnings)
+		fmt.Println(r.Content)
 	case wiki.DisplayError:
 		log.Fatal(r.Error)
 	case wiki.DisplayRedirect:
 		log.Fatal("Redirect: " + r.Redirect)
 	default:
 		log.Fatal("unsupported response type from wiki.DisplayPage()")
 	}
-}
-
-// prints the page result and exits
-func printPageResultAndExit(path string, html wikifier.HTML, warnings []wikifier.Warning) {
-
-	// print warnings to stderr
-	for _, w := range warnings {
-		log.Printf("%s:%d:%d: %s", path, w.Pos.Line, w.Pos.Column, w.Message)
-	}
-
-	// print html to stdout
-	fmt.Println(html)
-
 	os.Exit(0)
 }

wikifier/page.go

@@ -288,6 +288,10 @@ func (p *Page) Name() string {
 		return p.RelName()
 	}
 
+	if path == "" {
+		return ""
+	}
+
 	// make relative to page directory
 	if name, err := filepath.Rel(dir, path); err == nil {
 
@@ -333,7 +337,11 @@ func (p *Page) Prefix() string {
 // Path returns the absolute path to the page as resolved.
 // If the path does not resolve, returns an empty string.
 func (p *Page) Path() string {
-	return pageAbs(p.RelPath())
+	relPath := p.RelPath()
+	if relPath == "" {
+		return ""
+	}
+	return pageAbs(relPath)
 }
 
 // RelName returns the unresolved page filename, with or without extension.
@@ -348,6 +356,9 @@ func (p *Page) RelName() string {
 
 	dir := pageAbs(p.Opt.Dir.Page)
 	path := p.RelPath() // this is what makes it different from Name()
+	if path == "" {
+		return ""
+	}
 
 	// make relative to page directory
 	if name, err := filepath.Rel(dir, path); err == nil {
@@ -377,6 +388,9 @@ func (p *Page) RelPath() string {
 	if p.FilePath != "" {
 		return p.FilePath
 	}
+	if p.name == "" {
+		return ""
+	}
 	return filepath.Join(p.Opt.Dir.Page, p.name)
 }