hpz937/zurg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add bins to home page

Browse Source
This commit is contained in:
Ben Sarmiento
2024-05-25 01:54:35 +02:00
parent abb80b4257
commit a681912fc1
3 changed files with 53 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
internal/handlers/home.go
View File

@@ -10,6 +10,7 @@ import (
"github.com/debridmediamanager/zurg/internal/config" "github.com/debridmediamanager/zurg/internal/config"
"github.com/debridmediamanager/zurg/internal/version" "github.com/debridmediamanager/zurg/internal/version"
"github.com/debridmediamanager/zurg/pkg/realdebrid" "github.com/debridmediamanager/zurg/pkg/realdebrid"
mapset "github.com/deckarep/golang-set/v2"
) )
type SponsorResponse struct { type SponsorResponse struct {
@@ -18,21 +19,23 @@ type SponsorResponse struct {
Paypal string `json:"paypal"` Paypal string `json:"paypal"`
} }
type RootResponse struct { type RootResponse struct {
Version string `json:"version"` Version string `json:"version"`
BuiltAt string `json:"built_at"` BuiltAt string `json:"built_at"`
GitCommit string `json:"git_commit"` GitCommit string `json:"git_commit"`
Html string `json:"html"` Html string `json:"html"`
Dav string `json:"dav"` Dav string `json:"dav"`
Infuse string `json:"infuse"` Infuse string `json:"infuse"`
Logs string `json:"logs"` Logs string `json:"logs"`
UserInfo *realdebrid.User `json:"user_info"` // Replace UserInfoType with the actual type UserInfo *realdebrid.User `json:"user_info"` // Replace UserInfoType with the actual type
MemAlloc uint64 `json:"mem_alloc"` // Memory allocation in MB MemAlloc uint64 `json:"mem_alloc"` // Memory allocation in MB
TotalAlloc uint64 `json:"total_alloc"` // Total memory allocated in MB TotalAlloc uint64 `json:"total_alloc"` // Total memory allocated in MB
Sys uint64 `json:"sys"` // System memory in MB Sys uint64 `json:"sys"` // System memory in MB
NumGC uint32 `json:"num_gc"` // Number of completed GC cycles NumGC uint32 `json:"num_gc"` // Number of completed GC cycles
PID int `json:"pid"` // Process ID PID int `json:"pid"` // Process ID
Sponsor SponsorResponse `json:"sponsor_zurg"` // Sponsorship links Sponsor SponsorResponse `json:"sponsor_zurg"` // Sponsorship links
Config config.ZurgConfig `json:"config"` Config config.ZurgConfig `json:"config"`
ImmediateBin mapset.Set[string] `json:"immediate_bin"`
OnceDoneBin mapset.Set[string] `json:"once_done_bin"`
} }
func (zr *Handlers) handleHome(resp http.ResponseWriter, req *http.Request) { func (zr *Handlers) handleHome(resp http.ResponseWriter, req *http.Request) {
@@ -64,7 +67,9 @@ func (zr *Handlers) handleHome(resp http.ResponseWriter, req *http.Request) {
Github: "https://github.com/sponsors/debridmediamanager", Github: "https://github.com/sponsors/debridmediamanager",
Paypal: "https://paypal.me/yowmamasita", Paypal: "https://paypal.me/yowmamasita",
}, },
Config: zr.cfg.GetConfig(), Config: zr.cfg.GetConfig(),
ImmediateBin: zr.torMgr.ImmediateBin,
OnceDoneBin: zr.torMgr.OnceDoneBin,
} }
out := `<table border="1px"> out := `<table border="1px">
@@ -244,6 +249,14 @@ func (zr *Handlers) handleHome(resp http.ResponseWriter, req *http.Request) {
</tr> </tr>
<tr> <tr>
<td>On Library Update</td> <td>On Library Update</td>
<td>%v</td>
</tr>
<tr>
<td>Immediate Bin</td>
<td>%s</td>
</tr>
<tr>
<td>Once Done Bin</td>
<td>%s</td> <td>%s</td>
</tr> </tr>
<tr> <tr>
@@ -321,6 +334,8 @@ func (zr *Handlers) handleHome(resp http.ResponseWriter, req *http.Request) {
response.Config.ShouldServeFromRclone(), response.Config.ShouldServeFromRclone(),
response.Config.ShouldForceIPv6(), response.Config.ShouldForceIPv6(),
response.Config.GetOnLibraryUpdate(), response.Config.GetOnLibraryUpdate(),
response.ImmediateBin.String(),
response.OnceDoneBin.String(),
) )
fmt.Fprint(resp, out) fmt.Fprint(resp, out)

4
internal/torrent/manager.go
View File

@@ -45,8 +45,8 @@ type TorrentManager struct {
repairRunning bool repairRunning bool
repairRunningMu sync.Mutex repairRunningMu sync.Mutex
immediateBin mapset.Set[string] ImmediateBin mapset.Set[string]
onceDoneBin mapset.Set[string] OnceDoneBin mapset.Set[string]
} }
// NewTorrentManager creates a new torrent manager // NewTorrentManager creates a new torrent manager

40
internal/torrent/refresh.go
View File

@@ -412,16 +412,16 @@ func (t *TorrentManager) IsPlayable(filePath string) bool {
func (t *TorrentManager) initializeBins() { func (t *TorrentManager) initializeBins() {
if _, err := os.Stat("data/bins.json"); os.IsNotExist(err) { if _, err := os.Stat("data/bins.json"); os.IsNotExist(err) {
t.log.Warn("data/bins.json does not exist. Initializing empty bins.") t.log.Warn("data/bins.json does not exist. Initializing empty bins.")
t.immediateBin = mapset.NewSet[string]() t.ImmediateBin = mapset.NewSet[string]()
t.onceDoneBin = mapset.NewSet[string]() t.OnceDoneBin = mapset.NewSet[string]()
return return
} }
fileData, err := os.ReadFile("data/bins.json") fileData, err := os.ReadFile("data/bins.json")
if err != nil { if err != nil {
t.log.Errorf("Failed to read bins.json file: %v", err) t.log.Errorf("Failed to read bins.json file: %v", err)
t.immediateBin = mapset.NewSet[string]() t.ImmediateBin = mapset.NewSet[string]()
t.onceDoneBin = mapset.NewSet[string]() t.OnceDoneBin = mapset.NewSet[string]()
return return
} }
@@ -433,44 +433,44 @@ func (t *TorrentManager) initializeBins() {
return return
} }
t.immediateBin = mapset.NewSet[string](data["trash_bin"]...) t.ImmediateBin = mapset.NewSet[string](data["trash_bin"]...)
t.onceDoneBin = mapset.NewSet[string](data["repair_bin"]...) t.OnceDoneBin = mapset.NewSet[string](data["repair_bin"]...)
t.log.Debug("Successfully read bins from bins.json") t.log.Debug("Successfully read bins from bins.json")
t.log.Debugf("Bin immediately: %v", t.immediateBin.ToSlice()) t.log.Debugf("Bin immediately: %v", t.ImmediateBin.ToSlice())
t.log.Debugf("Bin once done: %v", t.onceDoneBin.ToSlice()) t.log.Debugf("Bin once done: %v", t.OnceDoneBin.ToSlice())
} }
func (t *TorrentManager) setToBinImmediately(torrentId string) { func (t *TorrentManager) setToBinImmediately(torrentId string) {
t.log.Debugf("Set to delete immediately: %s", torrentId) t.log.Debugf("Set to delete immediately: %s", torrentId)
t.immediateBin.Add(torrentId) t.ImmediateBin.Add(torrentId)
t.persistBins() t.persistBins()
} }
func (t *TorrentManager) setToBinOnceDone(torrentId string) { func (t *TorrentManager) setToBinOnceDone(torrentId string) {
t.log.Debugf("Set to delete once completed: %s", torrentId) t.log.Debugf("Set to delete once completed: %s", torrentId)
t.onceDoneBin.Add(torrentId) t.OnceDoneBin.Add(torrentId)
t.persistBins() t.persistBins()
} }
func (t *TorrentManager) binImmediately(torrentId string) bool { func (t *TorrentManager) binImmediately(torrentId string) bool {
if t.immediateBin.Contains(torrentId) { if t.ImmediateBin.Contains(torrentId) {
if err := t.api.DeleteTorrent(torrentId); err != nil { if err := t.api.DeleteTorrent(torrentId); err != nil {
t.log.Errorf("Failed to delete torrent %s: %v", torrentId, err) t.log.Errorf("Failed to delete torrent %s: %v", torrentId, err)
return false return false
} }
t.immediateBin.Remove(torrentId) t.ImmediateBin.Remove(torrentId)
return true return true
} }
return false return false
} }
func (t *TorrentManager) binOnceDone(torrentId string) bool { func (t *TorrentManager) binOnceDone(torrentId string) bool {
if t.onceDoneBin.Contains(torrentId) { if t.OnceDoneBin.Contains(torrentId) {
if err := t.api.DeleteTorrent(torrentId); err != nil { if err := t.api.DeleteTorrent(torrentId); err != nil {
t.log.Errorf("Failed to delete torrent %s: %v", torrentId, err) t.log.Errorf("Failed to delete torrent %s: %v", torrentId, err)
return false return false
} }
t.onceDoneBin.Remove(torrentId) t.OnceDoneBin.Remove(torrentId)
return true return true
} }
return false return false
@@ -478,8 +478,8 @@ func (t *TorrentManager) binOnceDone(torrentId string) bool {
func (t *TorrentManager) persistBins() { func (t *TorrentManager) persistBins() {
data := map[string]interface{}{ data := map[string]interface{}{
"trash_bin": t.immediateBin.ToSlice(), // Assuming trashBin is a mapset.Set[string] "trash_bin": t.ImmediateBin.ToSlice(), // Assuming trashBin is a mapset.Set[string]
"repair_bin": t.onceDoneBin.ToSlice(), // Assuming repairBin is a mapset.Set[string] "repair_bin": t.OnceDoneBin.ToSlice(), // Assuming repairBin is a mapset.Set[string]
} }
jsonData, err := json.Marshal(data) jsonData, err := json.Marshal(data)
@@ -502,12 +502,12 @@ func (t *TorrentManager) persistBins() {
} }
func (t *TorrentManager) cleanupBins(freshIDs mapset.Set[string]) { func (t *TorrentManager) cleanupBins(freshIDs mapset.Set[string]) {
t.immediateBin.Difference(freshIDs).Each(func(id string) bool { t.ImmediateBin.Difference(freshIDs).Each(func(id string) bool {
t.immediateBin.Remove(id) t.ImmediateBin.Remove(id)
return false return false
}) })
t.onceDoneBin.Difference(freshIDs).Each(func(id string) bool { t.OnceDoneBin.Difference(freshIDs).Each(func(id string) bool {
t.onceDoneBin.Remove(id) t.OnceDoneBin.Remove(id)
return false return false
}) })
t.persistBins() t.persistBins()