Skip to content

use hash of uri for stable filenames #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use hash of uri for stable filenames #120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions updater.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package main

import (
"crypto/sha256"
"bufio"
"fmt"
"io"
Expand All @@ -11,9 +12,9 @@ import (
"regexp"
"strings"
"sync"
"time"
)

var timesSeen = make(map[string]int)
var whitelist = make(map[string]bool)

// Update downloads all the blocklists and imports them into the database
Expand Down Expand Up @@ -66,6 +67,13 @@ func downloadFile(uri string, name string) error {
}
}(response.Body)

downloadTime := time.Now()
header := fmt.Sprintf(
"# Downloaded at %s from %s\n\n",
downloadTime.Format(time.RFC3339), uri,
)
output.WriteString(header)

if _, err := io.Copy(output, response.Body); err != nil {
return fmt.Errorf("error copying output: %s", err)
}
Expand All @@ -79,10 +87,14 @@ func fetchSources(sources []string) error {
for _, uri := range sources {
wg.Add(1)

// get the first 12 bytes of the sha256 hash of the uri
hash := sha256.New()
hash.Write([]byte(uri))
urihash := fmt.Sprintf("%s", hash.Sum(nil)[:12])

u, _ := url.Parse(uri)
host := u.Host
timesSeen[host] = timesSeen[host] + 1
fileName := fmt.Sprintf("%s.%d.list", host, timesSeen[host])
fileName := fmt.Sprintf("%s.%x.list", host, urihash)

go func(uri string, name string) {
logger.Debugf("fetching source %s\n", uri)
Expand Down