Log updates
This commit is contained in:
@@ -13,7 +13,7 @@ const BINS_FILE = "data/bins.json"
|
||||
// initializeBins reads from bins.json and assigns values to t.trashBin and t.repairBin
|
||||
func (t *TorrentManager) initializeBins() {
|
||||
if _, err := os.Stat(BINS_FILE); os.IsNotExist(err) {
|
||||
t.log.Warn("data/bins.json does not exist. Initializing empty bins.")
|
||||
t.repairLog.Warn("data/bins.json does not exist. Initializing empty bins.")
|
||||
t.ImmediateBin = mapset.NewSet[string]()
|
||||
t.OnceDoneBin = mapset.NewSet[string]()
|
||||
return
|
||||
@@ -21,7 +21,7 @@ func (t *TorrentManager) initializeBins() {
|
||||
|
||||
fileData, err := os.ReadFile(BINS_FILE)
|
||||
if err != nil {
|
||||
t.log.Errorf("Failed to read bins.json file: %v", err)
|
||||
t.repairLog.Errorf("Failed to read bins.json file: %v", err)
|
||||
t.ImmediateBin = mapset.NewSet[string]()
|
||||
t.OnceDoneBin = mapset.NewSet[string]()
|
||||
return
|
||||
@@ -31,15 +31,15 @@ func (t *TorrentManager) initializeBins() {
|
||||
|
||||
err = json.Unmarshal(fileData, &data)
|
||||
if err != nil {
|
||||
t.log.Errorf("Failed to unmarshal bin data: %v", err)
|
||||
t.repairLog.Errorf("Failed to unmarshal bin data: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
t.ImmediateBin = mapset.NewSet[string](data["trash_bin"]...)
|
||||
t.OnceDoneBin = mapset.NewSet[string](data["repair_bin"]...)
|
||||
|
||||
t.log.Debugf("Bin immediately: %v", t.ImmediateBin.ToSlice())
|
||||
t.log.Debugf("Bin once done: %v", t.OnceDoneBin.ToSlice())
|
||||
t.repairLog.Debugf("Bin immediately: %v", t.ImmediateBin.ToSlice())
|
||||
t.repairLog.Debugf("Bin once done: %v", t.OnceDoneBin.ToSlice())
|
||||
}
|
||||
|
||||
func (t *TorrentManager) persistBins() {
|
||||
@@ -50,37 +50,37 @@ func (t *TorrentManager) persistBins() {
|
||||
|
||||
jsonData, err := json.Marshal(data)
|
||||
if err != nil {
|
||||
t.log.Errorf("Failed to marshal bin data: %v", err)
|
||||
t.repairLog.Errorf("Failed to marshal bin data: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
file, err := os.Create(BINS_FILE)
|
||||
if err != nil {
|
||||
t.log.Errorf("Failed to create bins.json file: %v", err)
|
||||
t.repairLog.Errorf("Failed to create bins.json file: %v", err)
|
||||
return
|
||||
}
|
||||
defer file.Close()
|
||||
|
||||
_, err = file.Write(jsonData)
|
||||
if err != nil {
|
||||
t.log.Errorf("Failed to write to bins.json file: %v", err)
|
||||
t.repairLog.Errorf("Failed to write to bins.json file: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func (t *TorrentManager) setToBinImmediately(torrentId string) {
|
||||
t.log.Debugf("id=%s set to delete immediately", torrentId)
|
||||
t.repairLog.Debugf("id=%s set to delete immediately", torrentId)
|
||||
t.ImmediateBin.Add(torrentId)
|
||||
t.persistBins()
|
||||
}
|
||||
|
||||
func (t *TorrentManager) setToBinOnceDone(torrentId string) {
|
||||
t.log.Debugf("id=%s set to delete once it completes", torrentId)
|
||||
t.repairLog.Debugf("id=%s set to delete once it completes", torrentId)
|
||||
t.OnceDoneBin.Add(torrentId)
|
||||
t.persistBins()
|
||||
}
|
||||
|
||||
func (t *TorrentManager) setXToBinOnceYDone(deleteId, completeId string) {
|
||||
t.log.Debugf("id=%s set to delete once id=%s completes", deleteId, completeId)
|
||||
t.repairLog.Debugf("id=%s set to delete once id=%s completes", deleteId, completeId)
|
||||
t.OnceDoneBin.Add(fmt.Sprintf("%s-", completeId))
|
||||
t.OnceDoneBin.Add(fmt.Sprintf("%s-%s", completeId, deleteId))
|
||||
t.persistBins()
|
||||
@@ -89,7 +89,7 @@ func (t *TorrentManager) setXToBinOnceYDone(deleteId, completeId string) {
|
||||
func (t *TorrentManager) binImmediately(torrentId string) bool {
|
||||
if t.ImmediateBin.Contains(torrentId) {
|
||||
if err := t.api.DeleteTorrent(torrentId); err != nil {
|
||||
t.log.Errorf("Failed to delete torrent %s: %v", torrentId, err)
|
||||
t.repairLog.Errorf("Failed to delete torrent %s: %v", torrentId, err)
|
||||
return false
|
||||
}
|
||||
t.ImmediateBin.Remove(torrentId)
|
||||
@@ -109,7 +109,7 @@ func (t *TorrentManager) binOnceDoneErrorCheck(torrentId, status string) bool {
|
||||
func (t *TorrentManager) binOnceDone(torrentId string) bool {
|
||||
if t.OnceDoneBin.Contains(torrentId) {
|
||||
if err := t.api.DeleteTorrent(torrentId); err != nil {
|
||||
t.log.Errorf("Failed to delete torrent %s: %v", torrentId, err)
|
||||
t.repairLog.Errorf("Failed to delete torrent %s: %v", torrentId, err)
|
||||
return false
|
||||
}
|
||||
t.OnceDoneBin.Remove(torrentId)
|
||||
@@ -128,7 +128,7 @@ func (t *TorrentManager) binOnceDone(torrentId string) bool {
|
||||
if strings.Contains(entry, specialCase) {
|
||||
idToDelete := strings.Split(entry, "-")[1]
|
||||
if err := t.api.DeleteTorrent(idToDelete); err != nil {
|
||||
t.log.Errorf("Failed to delete torrent %s: %v", idToDelete, err)
|
||||
t.repairLog.Errorf("Failed to delete torrent %s: %v", idToDelete, err)
|
||||
hasError = true
|
||||
return true
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user