handle more heavily mangled keys

Author: whyrusleeping

ipfs-3-to-4/migration/migration.go

@@ -333,11 +333,6 @@ func transferBlocks(flatfsdir string) error {
 		}
 
 		rel := p[len(flatfsdir)+1:]
-		if !strings.HasPrefix(rel, "1220") {
-			fmt.Println("skipping: ", rel)
-			return nil
-		}
-
 		if !strings.HasSuffix(rel, ".data") {
 			fmt.Println("skipping (no .data): ", rel)
 			return nil
@@ -352,6 +347,12 @@ func transferBlocks(flatfsdir string) error {
 		prog.Next()
 		rel := p[len(flatfsdir)+1:]
 
+		justkey := rel[:len(rel)-5]
+		if validateNewKey(justkey) {
+			prog.Skip()
+			fmt.Printf("skipping %s, already in new format\n", justkey)
+		}
+
 		_, fi := filepath.Split(rel[:len(rel)-5])
 		k, err := hex.DecodeString(fi)
 		if err != nil {

sharness/t0080-three-to-four.sh

@@ -83,6 +83,7 @@ test_expect_success "add some files with the path clean bug" '
 	printf cdbd | ipfs add -q >> buggy_hashes &&
 	printf aabdb | ipfs add -q >> buggy_hashes &&
 	printf bccac | ipfs add -q >> buggy_hashes &&
+	echo 0243397916 | ipfs add -q >> buggy_hashes && # produces /../ in binary key
 	sort buggy_hashes -o buggy_hashes
 
 '