aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdzell <derz@elidragon.com>2022-04-21 21:12:15 +0200
committerEdzell <derz@elidragon.com>2022-04-21 21:12:15 +0200
commite1105f620214a1946164ba34bb27a40f54bc31ff (patch)
tree6842aa60baf3bd8ca2423928f4b3273b19e41574
parentdce91dcbe17fe9ed6bad234cde8e4cb35275ebd3 (diff)
some formatting and 100% not spelling mistakes
-rw-r--r--content.go6
-rw-r--r--mediacache.go5
2 files changed, 5 insertions, 6 deletions
diff --git a/content.go b/content.go
index 3f897b4..ed7a6ce 100644
--- a/content.go
+++ b/content.go
@@ -231,11 +231,10 @@ func handleContent(cc *contentConn) {
case *mt.ToCltAnnounceMedia:
var filenames []string
- RequestLoop:
for _, f := range cmd.Files {
if cc.fromCache(f.Name, f.Base64SHA1) {
- continue RequestLoop
+ continue
}
filenames = append(filenames, f.Name)
@@ -243,7 +242,7 @@ func handleContent(cc *contentConn) {
for i, mf := range cc.media {
if mf.name == f.Name {
cc.media[i].base64SHA1 = f.Base64SHA1
- continue RequestLoop
+ continue
}
}
@@ -251,7 +250,6 @@ func handleContent(cc *contentConn) {
name: f.Name,
base64SHA1: f.Base64SHA1,
})
-
}
cc.remotes = strings.Split(cmd.URL, ",")
diff --git a/mediacache.go b/mediacache.go
index d60faa2..4c9a753 100644
--- a/mediacache.go
+++ b/mediacache.go
@@ -10,7 +10,7 @@ import (
func (cc *contentConn) fromCache(filename, base64SHA1 string) bool {
os.Mkdir(Path("cache"), 0777)
- // convert to filename save b64
+ // convert to filename safe b64
base64SHA1Filesafe := strings.Replace(base64SHA1, "/", "_", -1)
base64SHA1Filesafe = strings.Replace(base64SHA1Filesafe, "+", "-", -1)
@@ -19,6 +19,7 @@ func (cc *contentConn) fromCache(filename, base64SHA1 string) bool {
if !os.IsNotExist(err) {
cc.log("->", "cache", err)
}
+
return false
}
@@ -35,7 +36,7 @@ func (cc *contentConn) updateCache() {
os.Mkdir(Path("cache"), 0777)
for _, f := range cc.media {
- // convert to filename save b64
+ // convert to filename safe b64
base64SHA1Filesafe := strings.Replace(f.base64SHA1, "/", "_", -1)
base64SHA1Filesafe = strings.Replace(base64SHA1Filesafe, "+", "-", -1)