From bbc0e3afcac64bbcee552e179081f658c7ce51cf Mon Sep 17 00:00:00 2001 From: YouROK <8YouROK8@mail.ru> Date: Mon, 6 Feb 2023 21:09:00 +0300 Subject: [PATCH 1/7] fix search --- server/rutor/torrsearch/index.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/rutor/torrsearch/index.go b/server/rutor/torrsearch/index.go index 74d459c..45f6e12 100644 --- a/server/rutor/torrsearch/index.go +++ b/server/rutor/torrsearch/index.go @@ -2,7 +2,6 @@ package torrsearch import ( "server/rutor/models" - "strconv" ) // Index is an inverted Index. It maps tokens to document IDs. @@ -21,7 +20,7 @@ func Search(text string) []int { func (idx Index) add(torrs []*models.TorrentDetails) { for ID, torr := range torrs { - for _, token := range analyze(torr.Name + " " + torr.GetNames() + " " + strconv.Itoa(torr.Year)) { + for _, token := range analyze(torr.Title) { ids := idx[token] if ids != nil && ids[len(ids)-1] == ID { // Don't add same ID twice. From 78ac3c0b4e512439fd1dbcace2529cb477f32ad3 Mon Sep 17 00:00:00 2001 From: YouROK <8YouROK8@mail.ru> Date: Mon, 6 Feb 2023 21:23:32 +0300 Subject: [PATCH 2/7] remove comments --- server/rutor/rutor.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/server/rutor/rutor.go b/server/rutor/rutor.go index 908d5ff..7fe41e3 100644 --- a/server/rutor/rutor.go +++ b/server/rutor/rutor.go @@ -134,15 +134,6 @@ func loadDB() { log.TLogln("Index rutor db") torrsearch.NewIndex(torrs) - - //err = dec.Decode(&ftorrs) - //if err == nil { - // torrs = ftorrs - // log.TLogln("Index rutor db") - // torrsearch.NewIndex(torrs) - //} else { - // log.TLogln("Error read rutor db:", err) - //} } else { log.TLogln("Error load rutor db:", err) } From caa15430239770cc845b0677ca3dcc5a13f2b2d9 Mon Sep 17 00:00:00 2001 From: YouROK <8YouROK8@mail.ru> Date: Mon, 6 Feb 2023 22:45:07 +0300 Subject: [PATCH 3/7] fix double load rutor db --- server/rutor/rutor.go | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/server/rutor/rutor.go b/server/rutor/rutor.go index 7fe41e3..016991a 100644 --- a/server/rutor/rutor.go +++ b/server/rutor/rutor.go @@ -28,8 +28,9 @@ var ( func Start() { go func() { if settings.BTsets.EnableRutorSearch { - loadDB() - updateDB() + if !updateDB() { + loadDB() + } isStop = false for !isStop { for i := 0; i < 3*60*60; i++ { @@ -53,27 +54,27 @@ func Stop() { } // https://github.com/yourok-0001/releases/raw/master/torr/rutor.ls -func updateDB() { +func updateDB() bool { log.TLogln("Update rutor db") fnTmp := filepath.Join(settings.Path, "rutor.tmp") out, err := os.Create(fnTmp) if err != nil { log.TLogln("Error create file rutor.tmp:", err) - return + return false } resp, err := http.Get("https://github.com/yourok-0001/releases/raw/master/torr/rutor.ls") if err != nil { log.TLogln("Error connect to rutor db:", err) out.Close() - return + return false } defer resp.Body.Close() _, err = io.Copy(out, resp.Body) out.Close() if err != nil { log.TLogln("Error download rutor db:", err) - return + return false } fnOrig := filepath.Join(settings.Path, "rutor.ls") @@ -84,17 +85,19 @@ func updateDB() { err = os.Remove(fnOrig) if err != nil && !os.IsNotExist(err) { log.TLogln("Error remove old rutor db:", err) - return + return false } err = os.Rename(fnTmp, fnOrig) if err != nil { log.TLogln("Error rename rutor db:", err) - return + return false } loadDB() + return true } else { os.Remove(fnTmp) } + return false } func loadDB() { From 39dd49d880745383871d878f63eb9fec7b63a037 Mon Sep 17 00:00:00 2001 From: YouROK <8YouROK8@mail.ru> Date: Mon, 6 Feb 2023 22:45:22 +0300 Subject: [PATCH 4/7] remove some stop words --- server/rutor/torrsearch/filter.go | 41 ++++--------------------------- 1 file changed, 5 insertions(+), 36 deletions(-) diff --git a/server/rutor/torrsearch/filter.go b/server/rutor/torrsearch/filter.go index c9f30fb..4d66417 100644 --- a/server/rutor/torrsearch/filter.go +++ b/server/rutor/torrsearch/filter.go @@ -57,42 +57,11 @@ func replaceChars(word string) string { func isStopWord(word string) bool { switch word { - case "a", "about", "above", "after", "again", "against", "all", "am", "an", - "and", "any", "are", "as", "at", "be", "because", "been", "before", - "being", "below", "between", "both", "but", "by", "can", "did", "do", - "does", "doing", "don", "down", "during", "each", "few", "for", "from", - "further", "had", "has", "have", "having", "he", "her", "here", "hers", - "herself", "him", "himself", "his", "how", "i", "if", "in", "into", "is", - "it", "its", "itself", "just", "me", "more", "most", "my", "myself", - "no", "nor", "not", "now", "of", "off", "on", "once", "only", "or", - "other", "our", "ours", "ourselves", "out", "over", "own", "s", "same", - "she", "should", "so", "some", "such", "t", "than", "that", "the", "their", - "theirs", "them", "themselves", "then", "there", "these", "they", - "this", "those", "through", "to", "too", "under", "until", "up", - "very", "was", "we", "were", "what", "when", "where", "which", "while", - "who", "whom", "why", "will", "with", "you", "your", "yours", "yourself", - "yourselves", "и", "в", "во", "не", "что", "он", "на", "я", "с", - "со", "как", "а", "то", "все", "она", "так", "его", - "но", "да", "ты", "к", "у", "же", "вы", "за", "бы", - "по", "только", "ее", "мне", "было", "вот", "от", - "меня", "еще", "нет", "о", "из", "ему", "теперь", - "когда", "даже", "ну", "вдруг", "ли", "если", "уже", - "или", "ни", "быть", "был", "него", "до", "вас", - "нибудь", "опять", "уж", "вам", "ведь", "там", "потом", - "себя", "ничего", "ей", "может", "они", "тут", "где", - "есть", "надо", "ней", "для", "мы", "тебя", "их", - "чем", "была", "сам", "чтоб", "без", "будто", "чего", - "раз", "тоже", "себе", "под", "будет", "ж", "тогда", - "кто", "этот", "того", "потому", "этого", "какой", - "совсем", "ним", "здесь", "этом", "один", "почти", - "мой", "тем", "чтобы", "нее", "сейчас", "были", "куда", - "зачем", "всех", "никогда", "можно", "при", "наконец", - "два", "об", "другой", "хоть", "после", "над", "больше", - "тот", "через", "эти", "нас", "про", "всего", "них", - "какая", "много", "разве", "три", "эту", "моя", - "впрочем", "хорошо", "свою", "этой", "перед", "иногда", - "лучше", "чуть", "том", "нельзя", "такой", "им", "более", - "всегда", "конечно", "всю", "между": + case "a", "am", "an", "and", "are", "as", "at", "be", + "by", "did", "do", "is", "of", "or", "s", "so", "t", + "и", "в", "с", "со", "а", "но", "к", "у", + "же", "бы", "по", "от", "о", "из", "ну", + "ли", "ни", "нибудь", "уж", "ведь", "ж", "об": return true } return false From 7e95fd6f2f2116d48b2bdf5fd25401a3f601d1c4 Mon Sep 17 00:00:00 2001 From: YouROK <8YouROK8@mail.ru> Date: Tue, 7 Feb 2023 15:55:23 +0300 Subject: [PATCH 5/7] remove stemmer word in search --- server/rutor/torrsearch/tokenizer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/rutor/torrsearch/tokenizer.go b/server/rutor/torrsearch/tokenizer.go index 3eaee9c..58c3cff 100644 --- a/server/rutor/torrsearch/tokenizer.go +++ b/server/rutor/torrsearch/tokenizer.go @@ -18,6 +18,6 @@ func analyze(text string) []string { tokens := tokenize(text) tokens = lowercaseFilter(tokens) tokens = stopwordFilter(tokens) - tokens = stemmerFilter(tokens) + //tokens = stemmerFilter(tokens) return tokens } From 69c727c6acac5bd4b177b3d3e253fa02ad4a7a4d Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Wed, 8 Feb 2023 10:59:06 +0300 Subject: [PATCH 6/7] Update installTorrServerMac.sh --- installTorrServerMac.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installTorrServerMac.sh b/installTorrServerMac.sh index b211af6..89f4554 100755 --- a/installTorrServerMac.sh +++ b/installTorrServerMac.sh @@ -82,7 +82,7 @@ function installTorrServer() { echo "" } binName="TorrServer-darwin-${architecture}" - [[ ! -d "$dirInstall" ]] && mkdir -p ${dirInstall} + [[ ! -d "$dirInstall" ]] && mkdir -p ${dirInstall} && chmod a+rw ${dirInstall} urlBin="https://github.com/YouROK/TorrServer/releases/download/$(getLatestRelease)/${binName}" if [[ ! -f "$dirInstall/$binName" ]] | [[ ! -x "$dirInstall/$binName" ]] || [[ $(stat -c%s "$dirInstall/$binName" 2>/dev/null) -eq 0 ]]; then curl -L --progress-bar -# -o "$dirInstall/$binName" "$urlBin" From 096ac2717ee737cc4c1c23c2267b895b50100e9e Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Wed, 8 Feb 2023 11:03:46 +0300 Subject: [PATCH 7/7] Update installTorrServerMac.sh --- installTorrServerMac.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installTorrServerMac.sh b/installTorrServerMac.sh index 89f4554..404e4e8 100755 --- a/installTorrServerMac.sh +++ b/installTorrServerMac.sh @@ -174,7 +174,7 @@ EOF else sed -i '' -e '/httpauth/d' $dirInstall/$serviceName.plist fi - [[ $lang == "en" ]] && read -p ' Add autostart for current user (1) or all users (2)? ' answer_cu