Ticket #43: patch_collide.diff

htmlgen.go

@@ -19 +19 @@
 
 import (
         "bytes"
-        "encoding/hex"
         "errors"
         "fmt"
         "html"
@@ -62 +61 @@
                         return fmt.Sprintf(`src="%v"`, url)
                 }
                 if options.inline {
-                        return fmt.Sprintf(`data-imgsrc="res_%v"`, string(hex.EncodeToString([]byte(url))))
+                        return fmt.Sprintf(`data-imgsrc="res_%v"`, urlToCopiedResourceName(url))
                 }
                 return fmt.Sprintf(`src="%v"`, url)
         }
@@ -157 +156 @@
 
 func (this *HTMLGenerator) imgSrc(href string) string {
         if this.options.inline && CanInline(href) {
-                return fmt.Sprintf(`data-imgsrc="res_%v"`, string(hex.EncodeToString([]byte(filepath.Base(href)))))
+                return fmt.Sprintf(`data-imgsrc="res_%v"`, urlToCopiedResourceName(href))
         }
         if CanInline(href) { // The file will be copied
-                return fmt.Sprintf(`src="%v"`, filepath.Base(href))
+                return fmt.Sprintf(`src="%v"`, urlToCopiedResourceNameExt(href))
         }
         return fmt.Sprintf(`src="%v"`, href)
 }

resource.go

@@ -19 +19 @@
 
 import (
         "encoding/base64"
-        "encoding/hex"
         "fmt"
         "io/ioutil"
         "log"
@@ -64 +63 @@
         return &Resource{name, true, resType, funcGetBytes}
 }
 
+
+func urlToCopiedResourceName(url string) string {
+        return func_hash(url)
+}
+
+func urlToCopiedResourceNameExt(url string) string {
+        return urlToCopiedResourceName(url)+filepath.Ext(url)
+}
+
 func NewExternalResource(url string, resType resourceType) *Resource {
         if CanInline(url) {
                 f := func() []byte {
@@ -119 +127 @@
 
         switch this.resType {
         case typeImage:
-                f.WriteString(fmt.Sprintf("window.res_%v = '%v';\n", string(hex.EncodeToString([]byte(filepath.Base(this.url)))), InlineImage(this.url, this.GetBytes())))
+                f.WriteString(fmt.Sprintf("window.res_%v = '%v';\n", urlToCopiedResourceName(this.url), InlineImage(this.url, this.GetBytes())))
         case typeCss, typeScript:
                 f.Write(this.GetBytes())
         case typeFont:
@@ -141 +149 @@
 func (this *Resource) ToHtmlLink(f *os.File) {
         url := this.url
         // If the file will be copied and if it is not builtin, remove the path from the URL
-        if !this.builtin && !strings.HasPrefix(this.url, "http:") && !strings.HasPrefix(this.url, "https:") {
-                url = filepath.Base(url)
+        if !strings.HasPrefix(this.url, "http:") && !strings.HasPrefix(this.url, "https:") {
+                url = urlToCopiedResourceNameExt(url)
         }
         switch this.resType {
         case typeCss:
@@ -171 +179 @@
         }
 
         if this.builtin {
-                err := ioutil.WriteFile(filepath.Join(destpath, this.url), this.GetBytes(), 0664)
+                err := ioutil.WriteFile(filepath.Join(destpath, urlToCopiedResourceNameExt(this.url)), this.GetBytes(), 0664)
                 if err != nil {
                         log.Printf("Could not write file %v", this.url)
                 }
         } else {
-                CopyFile(filepath.Join(destpath, filepath.Base(this.url)), this.url)
+                CopyFile(filepath.Join(destpath, urlToCopiedResourceNameExt(this.url)), this.url)
         }
 
         writtenResource[this.url] = true