Fix decoding hashes

BasicMap.go

@@ -2,6 +2,7 @@ package ch
 
 import (
 	"cmp"
+	"errors"
 	"fmt"
 	"math/bits"
 	"slices"
@@ -88,7 +89,7 @@ func (b *basicMapStorage) InsertHash(hashType int, hash uint64, ids *[]ID) {
 	if hashFound {
 		return
 	}
-	slices.Insert(b.hashes[hashType], index, structHash{hash, ids})
+	b.hashes[hashType] = slices.Insert(b.hashes[hashType], index, structHash{hash, ids})
 }
 
 func (b *basicMapStorage) MapHashes(hash ImageHash) {
@@ -99,6 +100,7 @@ func (b *basicMapStorage) MapHashes(hash ImageHash) {
 		ids, ok := b.ids[hash.ID]
 		if !ok {
 			ids = &[]ID{hash.ID}
+			b.ids[hash.ID] = ids
 		}
 
 		b.InsertHash(hashType, ih.Hash, ids)
@@ -110,6 +112,9 @@ func (b *basicMapStorage) DecodeHashes(hashes SavedHashes) error {
 		b.hashes[hashType] = make([]structHash, len(sourceHashes))
 		for savedHash, idlistLocation := range sourceHashes {
 			b.hashes[hashType] = append(b.hashes[hashType], structHash{savedHash, &hashes.IDs[idlistLocation]})
+			for _, id := range hashes.IDs[idlistLocation] {
+				b.ids[id] = &hashes.IDs[idlistLocation]
+			}
 		}
 	}
 	for hashType := range b.hashes {
@@ -129,15 +134,23 @@ func (b *basicMapStorage) printSizes() {
 }
 
 func (b *basicMapStorage) EncodeHashes() (SavedHashes, error) {
-	hashes := SavedHashes{}
+	hashes := SavedHashes{
+		Hashes: [3]map[uint64]int{
+			make(map[uint64]int),
+			make(map[uint64]int),
+			make(map[uint64]int),
+		},
+	}
 	idmap := map[*[]ID]int{}
+
 	for _, ids := range b.ids {
 		if _, ok := idmap[ids]; ok {
 			continue
 		}
-		hashes.IDs = append(hashes.IDs, *ids)
 		idmap[ids] = len(hashes.IDs)
+		hashes.IDs = append(hashes.IDs, *ids)
 	}
+
 	for hashType, hashToID := range b.hashes {
 		for _, hash := range hashToID {
 			hashes.Hashes[hashType][hash.hash] = idmap[hash.ids]
@@ -146,22 +159,22 @@ func (b *basicMapStorage) EncodeHashes() (SavedHashes, error) {
 	return hashes, nil
 }
 
-func (b *basicMapStorage) AssociateIDs(newids []NewIDs) {
+func (b *basicMapStorage) AssociateIDs(newids []NewIDs) error {
 	for _, newid := range newids {
 		ids, found := b.ids[newid.OldID]
 		if !found {
-			msg := "No IDs belonging to " + newid.OldID.Domain + "exist on this server"
-			panic(msg)
+			msg := "No IDs belonging to " + string(newid.OldID.Domain) + " exist on this server"
+			return errors.New(msg)
 		}
 		*ids = InsertID(*ids, newid.NewID)
 	}
+	return nil
 }
 
 func (b *basicMapStorage) GetIDs(id ID) IDList {
 	ids, found := b.ids[id]
 	if !found {
-		msg := "No IDs belonging to " + id.Domain + "exist on this server"
-		panic(msg)
+		return nil
 	}
 	return ToIDList(*ids)
 }
@@ -169,12 +182,8 @@ func (b *basicMapStorage) GetIDs(id ID) IDList {
 func NewBasicMapStorage() (HashStorage, error) {
 	storage := &basicMapStorage{
 		hashMutex: sync.RWMutex{},
-
-		hashes: [3][]structHash{
-			[]structHash{},
-			[]structHash{},
-			[]structHash{},
-		},
+		ids:       make(map[ID]*[]ID),
+		hashes:    [3][]structHash{},
 	}
 	return storage, nil
 }

cmd/comic-hasher/main.go

@@ -459,7 +459,7 @@ func (s *Server) addCover(w http.ResponseWriter, r *http.Request) {
 		return
 	default:
 	}
-	s.hashingQueue <- ch.Im{Im: i, Format: format, ID: ch.ID{Domain: ch.Source(domain), ID: ID}, Path: ""}
+	s.hashingQueue <- ch.Im{Im: i, Format: format, ID: ch.ID{Domain: ch.Source(domain), ID: ID}}
 	writeJson(w, http.StatusOK, result{Msg: "Success"})
 }
 
@@ -489,7 +489,7 @@ func (s *Server) hasher(workerID int, done func()) {
 		}
 
 		elapsed := time.Since(start)
-		log.Printf("Hashing took %v: worker: %v. path: %s %s: %064b id: %s\n", elapsed, workerID, image.Path, hash.Hashes[0].Kind, hash.Hashes[0].Hash, hash.ID)
+		log.Printf("Hashing took %v: worker: %v. %s: %064b id: %s\n", elapsed, workerID, hash.Hashes[0].Kind, hash.Hashes[0].Hash, hash.ID)
 	}
 }
 
@@ -508,8 +508,7 @@ func (s *Server) reader(workerID int, done func()) {
 
 		im := ch.Im{
 			Im: i, Format: format,
-			ID:   ch.ID{Domain: ch.Source(filepath.Base(filepath.Dir(filepath.Dir(path)))), ID: filepath.Base(filepath.Dir(path))},
-			Path: path,
+			ID: ch.ID{Domain: ch.Source(filepath.Base(filepath.Dir(filepath.Dir(path)))), ID: filepath.Base(filepath.Dir(path))},
 		}
 		select {
 		case <-s.quit:
@@ -553,8 +552,8 @@ func (s *Server) DecodeHashes(format Format, hashes []byte) error {
 	}
 	loadedHashes := ch.SavedHashes{}
 	err := decoder(hashes, &loadedHashes)
-	if err != nil || len(loadedHashes.IDs) == 0 {
-		fmt.Println("Failed to load hashes, checking if they are old hashes", err)
+	if err != nil {
+		fmt.Println("Failed to load hashes, checking if they are old hashes", format, ":", err)
 		oldHashes := make(ch.OldSavedHashes)
 		if err = decoder(hashes, &oldHashes); err != nil {
 			return err

hashing.go

@@ -63,7 +63,6 @@ type Result struct {
 type Im struct {
 	Im     image.Image
 	Format string
-	Path   string
 	ID     ID
 }
 
@@ -164,7 +163,7 @@ type HashStorage interface {
 	MapHashes(ImageHash)
 	DecodeHashes(hashes SavedHashes) error
 	EncodeHashes() (SavedHashes, error)
-	AssociateIDs(newIDs []NewIDs)
+	AssociateIDs(newIDs []NewIDs) error
 	GetIDs(id ID) IDList
 }
 

sqlite.go

@@ -354,26 +354,26 @@ func (s *sqliteStorage) EncodeHashes() (SavedHashes, error) {
 	return hashes, nil
 }
 
-func (s *sqliteStorage) AssociateIDs(newIDs []NewIDs) {
+func (s *sqliteStorage) AssociateIDs(newIDs []NewIDs) error {
 	for _, ids := range newIDs {
 		var oldIDID, newIDID int
 		_, err := s.db.Exec(`INSERT INTO IDs domain,id VALUES (?,?)`, ids.NewID.Domain, ids.NewID.ID)
 		if err != nil {
-			panic(err)
+			return err
 		}
 		rows, err := s.db.Query(`SELECT idid FROM IDs WHERE domain=? AND id=?`, ids.NewID.Domain, ids.NewID.ID)
 		if err != nil && !errors.Is(err, sql.ErrNoRows) {
-			panic(err)
+			return err
 		}
 		if rows.Next() {
 			rows.Scan(&newIDID)
 		} else {
-			panic("Unable to insert New ID into database")
+			return errors.New("Unable to insert New ID into database")
 		}
 		rows.Close()
 		rows, err = s.db.Query(`SELECT idid FROM IDs WHERE domain=? AND id=?`, ids.OldID.Domain, ids.OldID.ID)
 		if err != nil && !errors.Is(err, sql.ErrNoRows) {
-			panic(err)
+			return err
 		}
 		if rows.Next() {
 			rows.Scan(&oldIDID)
@@ -382,16 +382,17 @@ func (s *sqliteStorage) AssociateIDs(newIDs []NewIDs) {
 		}
 		_, err = s.db.Exec(`INSERT INTO id_hash (hashid, id_id) SELECT hashid,? FROM id_hash where id_id=?`, newIDID, oldIDID)
 		if err != nil {
-			panic(err)
+			return fmt.Errorf("Unable to associate IDs: %w", err)
 		}
 	}
+	return nil
 }
 
 func (s *sqliteStorage) GetIDs(id ID) IDList {
 	var idid int
 	rows, err := s.db.Query(`SELECT idid FROM IDs WHERE domain=? AND id=?`, id.Domain, id.ID)
 	if err != nil && !errors.Is(err, sql.ErrNoRows) {
-		panic(err)
+		return nil
 	}
 	if rows.Next() {
 		rows.Scan(&idid)

vp-tree.go

@@ -85,8 +85,8 @@ func (v *VPTree) EncodeHashes() (SavedHashes, error) {
 	return SavedHashes{}, errors.New("Not Implemented")
 }
 
-func (v *VPTree) AssociateIDs(newIDs []NewIDs) {
-	panic("Not Implemented")
+func (v *VPTree) AssociateIDs(newIDs []NewIDs) error {
+	return errors.New("Not Implemented")
 }
 
 func (v *VPTree) GetIDs(id ID) IDList {