Merge branch 'relative-file' into relative-paths

Author: bfabio

fields.go

@@ -48,30 +48,43 @@ func validateFieldsV0(publiccode PublicCode, parser Parser, network bool) error
 	}
 
 	if publiccodev0.Logo != "" {
+<<<<<<< HEAD
 		if _, err := isRelativePathOrURL(publiccodev0.Logo, "logo"); err != nil {
 			vr = append(vr, err)
 		} else if validLogo, err := parser.validLogo(toCodeHostingURL(publiccodev0.Logo, parser.baseURL), network); !validLogo {
+=======
+		if validLogo, err := parser.validLogo(toCodeHostingURL(publiccodev0.Logo, parser.baseURL, parser.localFilePath), network); !validLogo {
+>>>>>>> relative-file
 			vr = append(vr, newValidationError("logo", err.Error()))
 		}
 	}
 
 	if publiccodev0.MonochromeLogo != "" {
 		vr = append(vr, ValidationWarning{"monochromeLogo", "This key is DEPRECATED and will be removed in the future", 0, 0})
 
+<<<<<<< HEAD
 		if _, err := isRelativePathOrURL(publiccodev0.MonochromeLogo, "monochromeLogo"); err != nil {
 			vr = append(vr, err)
 		} else if validLogo, err := parser.validLogo(toCodeHostingURL(publiccodev0.MonochromeLogo, parser.baseURL), network); !validLogo {
+=======
+		if validLogo, err := parser.validLogo(toCodeHostingURL(publiccodev0.MonochromeLogo, parser.baseURL, parser.localFilePath), network); !validLogo {
+>>>>>>> relative-file
 			vr = append(vr, newValidationError("monochromeLogo", err.Error()))
 		}
 	}
 
 	if publiccodev0.Legal.AuthorsFile != nil {
 		vr = append(vr, ValidationWarning{"legal.authorsFile", "This key is DEPRECATED and will be removed in the future", 0, 0})
 
+<<<<<<< HEAD
 		if _, err := isRelativePathOrURL(*publiccodev0.Legal.AuthorsFile, "legal.authorsFile"); err != nil {
 			vr = append(vr, err)
 		} else if exists, err := parser.fileExists(toCodeHostingURL(*publiccodev0.Legal.AuthorsFile, parser.baseURL), network); !exists {
 			u := toCodeHostingURL(*publiccodev0.Legal.AuthorsFile, parser.baseURL)
+=======
+		if !parser.fileExists(toCodeHostingURL(*publiccodev0.Legal.AuthorsFile, parser.baseURL, parser.localFilePath), network) {
+			u := toCodeHostingURL(*publiccodev0.Legal.AuthorsFile, parser.baseURL, parser.localFilePath)
+>>>>>>> relative-file
 
 			vr = append(vr, newValidationError("legal.authorsFile", "'%s' does not exist: %s", urlutil.DisplayURL(&u), err.Error()))
 		}
@@ -116,10 +129,14 @@ func validateFieldsV0(publiccode PublicCode, parser Parser, network bool) error
 		}
 
 		for i, v := range desc.Screenshots {
+<<<<<<< HEAD
 			keyName := fmt.Sprintf("description.%s.screenshots[%d]", lang, i)
 			if _, err := isRelativePathOrURL(v, keyName); err != nil {
 				vr = append(vr, err)
 			} else if isImage, err := parser.isImageFile(toCodeHostingURL(v, parser.baseURL), network); !isImage {
+=======
+			if isImage, err := parser.isImageFile(toCodeHostingURL(v, parser.baseURL, parser.localFilePath), network); !isImage {
+>>>>>>> relative-file
 				vr = append(vr, newValidationError(
 					keyName,
 					"'%s' is not an image: %s", v, err.Error(),

parser.go

@@ -48,6 +48,7 @@ type Parser struct {
 	domain         Domain
 	branch         string
 	baseURL        *url.URL
+	localFilePath  string
 }
 
 // Domain is a single code hosting service.
@@ -274,6 +275,7 @@ func (p *Parser) Parse(uri string) (PublicCode, error) {
 		if err != nil {
 			return nil, fmt.Errorf("can't open file '%s': %w", url.Path, err)
 		}
+		p.localFilePath = url.Path
 	} else {
 		resp, err := http.Get(uri)
 		if err != nil {

validations.go

@@ -96,7 +96,7 @@ func (p *Parser) isReachable(u url.URL, network bool) (bool, error) {
 //
 // It supports relative paths and turns them into remote URLs or file:// URLs
 // depending on the value of baseURL
-func toCodeHostingURL(file string, baseURL *url.URL) url.URL {
+func toCodeHostingURL(file string, baseURL *url.URL, localFilePath string) url.URL {
 	// Check if file is an absolute URL
 	if uri, err := url.ParseRequestURI(file); err == nil {
 		if raw := vcsurl.GetRawFile(uri); raw != nil {
@@ -116,9 +116,8 @@ func toCodeHostingURL(file string, baseURL *url.URL) url.URL {
 		return u
 	}
 
-	// Let's construct a valid URL that will not be used anyway, because
-	// of DisableNetwork == true.
-	return url.URL{Scheme: "file", Path: file}
+	// It's a local file
+	return url.URL{Scheme: "file", Path: path.Join(localFilePath, file)}
 }
 
 // fileExists returns true if the file resource exists.