From 5261e54abf92817d5b5e973da5951f067435ab3c Mon Sep 17 00:00:00 2001 From: akuma06 Date: Sat, 21 Oct 2017 10:08:33 +0200 Subject: [PATCH] Removing some logs (#1686) * [WIP] Torrent Generation on not found error As asked in #1517, it allows on-the-fly torrent generation. Since it uses magnet links, it needs some time to connect to peers. So it can't be instant generation, we need the user to wait and try after a minute at least. * Replace Fatal by simple error * attempt at fixing travis * del * Add Anacrolyx dependency * Add back difflib * Remove .torrent suffix in the url example * Add some explanations when file missing page shown * Ignore downloads directory * Either use cache (third-party site) or own download directory * Wrong import * If there is an error then it means we aren't generating a torrent file May it be "torrent not found" or "We do not store torrent files" which are the two only existing errors for this page * hash is never empty * TorrentLink may be empty at times So we add a /download/:hash link if it is * Update README.md * Made a mistake here, need to check if false * Update en-us.all.json * Update CHANGELOG.md * Torrent file generation can be triggered by click on button if JS enabled * Update download.go * Update download.go * Use c.JSON instead of text/template * Return to default behavior if we don't generate the file * Don't do the query if returned to default behavior * Add "Could not generate torrent file" error * Fix JS condition & lower delay until button updates * Start download automatically once torrent file is generated * Fix torrentFileExists() constantly returning false if external torrent download URL * torrent-view-data is two tables instead of one This allows the removal of useless things without any problem (e.g Website link), but also a better responsibe design since the previous one separated stats after a certain res looking very wonky * CSS changes to go along * Remove useless * Update main.css * In torrentFileExists, check if filestorage path exists instead of looking at the domain in torrent link When checking if the file is stored on another server i used to simply check if the domain name was inside the torrent link, but we can straight up check for filestorage length * Fix JS of on-demand stat fetching * ScrapeAge variable accessible through view.jet.html Contains last scraped time in hours, is at -1 is torrent has never been scraped Stats will get updated if it's either at -1 or above 1460 (2 months old) * Refresh stats if older than two months OR unknown and older than 24h Show last scraped date even if stats are unknown * Add StatsObsolete variable to torrent Indicating if: - They can be shown - They need to be updated * Update scraped data even if Unknown, prevent users from trying to fetch stats every seconds * Torrent file stored locally by default * no need to do all of that if no filestorage * fix filestorage path * Fix torrent download button stuck on "Generating torrent file" at rare times * fix some css rules that didn't work on IE * Fix panic error Seems like this error is a known bug from anacrolyx torrent https://github.com/anacrolix/torrent/issues/83 To prevent it, I'm creating a single client and modifying the socket.go to make it not raise a panic but a simple error log. * Removing some logs --- utils/upload/generate.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/utils/upload/generate.go b/utils/upload/generate.go index 2589e2ba..6d10b6f6 100644 --- a/utils/upload/generate.go +++ b/utils/upload/generate.go @@ -51,31 +51,26 @@ func GenerateTorrent(magnet string) error { } go func() { <-t.GotInfo() - fmt.Println("got info") mi := t.Metainfo() - fmt.Println("meta info") t.Drop() - fmt.Println("drop") - f, err := os.Create(fmt.Sprintf("%s%c%s.torrent", config.Get().Torrents.FileStorage, os.PathSeparator, t.InfoHash().String())) - fmt.Println("open file") + file := fmt.Sprintf("%s%c%s.torrent", config.Get().Torrents.FileStorage, os.PathSeparator, t.InfoHash().String()) + f, err := os.Create(file) if err != nil { log.Errorf("error creating torrent metainfo file: %s", err) return } - fmt.Println("defer") defer f.Close() - fmt.Println("bencode") err = bencode.NewEncoder(f).Encode(mi) if err != nil { log.Errorf("error writing torrent metainfo file: %s", err) return } - fmt.Println("for loop") for k, m := range queue { if m == magnet { queue = append(queue[:k], queue[k+1:]...) } } + log.Infof("New torrent file generated in: %s", file) }() return nil }