Enhance Page and Resource String()

diff --git a/hugolib/page.go b/hugolib/page.go
index 7c2ac70b291d289748a8c75ce6336f3a9545fdcb..89d68084ed0e6f30237550f56d2fe9d6dc2a2d1c 100644 (file)
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -2013,7 +2013,11 @@ func (p *Page) RelRef(refs ...string) (string, error) {
 }
 
 func (p *Page) String() string {
+       if p.Path() != "" {
+               return fmt.Sprintf("Page(%s)", p.Path())
+       }
        return fmt.Sprintf("Page(%q)", p.title)
+
 }
 
 // Scratch returns the writable context associated with this Page.

diff --git a/resource/resource.go b/resource/resource.go
index e92706803ee92b96b6664e35cbe842bb8cd7bc26..0714805e87305c755ea5b1344e56e4367335e3ff 100644 (file)
--- a/resource/resource.go
+++ b/resource/resource.go
@@ -419,8 +419,6 @@ type genericResource struct {
        // The relative path to this resource.
        relTargetPath dirFile
 
-       file string
-
        // Base is set when the output format's path has a offset, e.g. for AMP.
        base string
 
@@ -554,6 +552,10 @@ func (l *genericResource) AbsSourceFilename() string {
        return l.sourceFilename
 }
 
+func (l *genericResource) String() string {
+       return fmt.Sprintf("Resource(%s: %s)", l.resourceType, l.name)
+}
+
 func (l *genericResource) Publish() error {
        f, err := l.sourceFs().Open(l.AbsSourceFilename())
        if err != nil {