Merge pull request #274 from cdnjs/sven/fix-sri

don't write SRIs when already existing

cmd/process-version/main.go

@@ -89,8 +89,12 @@ func (j optimizeJob) emitFromWorkspace(src string) {
 	ext := path.Ext(src)
 	if _, ok := calculateSRI[ext]; ok {
 		outSRI := fmt.Sprintf("%s.sri", dest)
-		sri.CalculateFileSRI(src, outSRI)
-		log.Printf("sri %s -> %s\n", src, outSRI)
+		if _, err := os.Stat(outSRI); err == nil {
+			log.Printf("file %s already exists at the output\n", outSRI)
+		} else {
+			sri.CalculateFileSRI(src, outSRI)
+			log.Printf("sri %s -> %s\n", src, outSRI)
+		}
 	}
 
 	if _, ok := doNotCompress[ext]; !ok {

packages/packages.go

@@ -176,15 +176,15 @@ func (p *Package) NpmFilesFrom(base string) []NpmFileMoveOp {
 			util.Check(err) // should have already run before in checker so panic if glob invalid
 
 			for _, f := range list {
-				fp := path.Join(basePath, f)
+				filename := path.Join(basePath, f)
 
 				// check if file has been processed before
-				if _, ok := seen[fp]; ok {
+				if _, ok := seen[filename]; ok {
 					continue
 				}
-				seen[fp] = true
+				seen[filename] = true
 
-				info, staterr := os.Stat(fp)
+				info, staterr := os.Stat(filename)
 				if staterr != nil {
 					log.Printf("stat: %s\n", staterr.Error())
 					continue

scripts/test-process-version.sh

@@ -6,19 +6,21 @@ set -e
 echo "processing $package $version"
 
 export DOCKER_BUILDKIT=1
+rm -rf /tmp/output /tmp/input
 mkdir -p /tmp/input /tmp/output 
-rm -rf /tmp/output/* /tmp/input/*
 
 echo "loading new version files"
 curl --fail https://storage.googleapis.com/cdnjs-incoming-prod/$package-$version.tgz > /tmp/input/new-version.tgz
 echo "loading package configuration"
 curl --fail https://raw.githubusercontent.com/cdnjs/packages/master/packages/${package::1}/$package.json > /tmp/input/config.json
 
-cat /tmp/input/config.json
+cat /tmp/input/config.json | jq .
 
 echo "----------------- input files -----------------"
 ls -lh /tmp/input
 
+tar -tvf /tmp/input/new-version.tgz
+
 docker build -f docker/process-version/Dockerfile -t sandbox .
 docker run -it -v /tmp/input:/input -v /tmp/output:/output sandbox