refactor(users/Profpatsch/whatcd-resolver): split table data fetch
Change-Id: Ic9b2f1e6a5ff0c65b93c1662bad75fb41c86bfcd Reviewed-on: https://cl.tvl.fyi/c/depot/+/11759 Tested-by: BuildkiteCI Reviewed-by: Profpatsch <mail@profpatsch.de> Autosubmit: Profpatsch <mail@profpatsch.de>
This commit is contained in:
parent
d0ab3c8d15
commit
1b887b43da
2 changed files with 40 additions and 25 deletions
|
@ -386,7 +386,7 @@ getTorrentById dat = do
|
|||
|
||||
data GetBestTorrentsFilter = GetBestTorrentsFilter
|
||||
{ onlyDownloaded :: Bool,
|
||||
onlyArtist :: Maybe (Label "redactedId" Natural)
|
||||
onlyArtist :: Maybe (Label "artistRedactedId" Natural)
|
||||
}
|
||||
|
||||
-- | Find the best torrent for each torrent group (based on the seeding_weight)
|
||||
|
@ -426,7 +426,7 @@ getBestTorrents opts = do
|
|||
( do
|
||||
let (onlyArtistB, onlyArtistId) = case opts.onlyArtist of
|
||||
Nothing -> (True, 0)
|
||||
Just a -> (False, a.redactedId)
|
||||
Just a -> (False, a.artistRedactedId)
|
||||
( opts.onlyDownloaded :: Bool,
|
||||
onlyArtistB :: Bool,
|
||||
onlyArtistId & fromIntegral @Natural @Int
|
||||
|
|
|
@ -214,7 +214,7 @@ htmlUi = do
|
|||
let HandlerResponses {htmlWithQueryArgs} = respond
|
||||
|
||||
htmlWithQueryArgs
|
||||
( label @"redactedId"
|
||||
( label @"artistRedactedId"
|
||||
<$> (singleQueryArgument "redacted_id" (Field.utf8 >>> Field.decimalNatural))
|
||||
)
|
||||
$ \qry _span -> do
|
||||
|
@ -316,7 +316,7 @@ htmlPageChrome body =
|
|||
|]
|
||||
|
||||
artistPage ::
|
||||
( HasField "redactedId" dat Natural,
|
||||
( HasField "artistRedactedId" dat Natural,
|
||||
MonadPostgres m,
|
||||
MonadOtel m,
|
||||
MonadLogger m,
|
||||
|
@ -326,11 +326,11 @@ artistPage ::
|
|||
dat ->
|
||||
m Html
|
||||
artistPage dat = runTransaction $ do
|
||||
torrents <- getBestTorrentsTable (Just $ getLabel @"redactedId" dat)
|
||||
torrents <- getBestTorrentsTable (Just $ getLabel @"artistRedactedId" dat)
|
||||
pure $
|
||||
htmlPageChrome
|
||||
[hsx|
|
||||
Artist ID: {dat.redactedId}
|
||||
Artist ID: {dat.artistRedactedId}
|
||||
|
||||
{torrents}
|
||||
|]
|
||||
|
@ -474,7 +474,7 @@ snipsRedactedSearch dat = do
|
|||
]
|
||||
runTransaction $ do
|
||||
t
|
||||
getBestTorrentsTable (Nothing :: Maybe (Label "redactedId" Natural))
|
||||
getBestTorrentsTable (Nothing :: Maybe (Label "artistRedactedId" Natural))
|
||||
|
||||
data ArtistFilter = ArtistFilter
|
||||
{ onlyArtist :: Maybe (Label "artistId" Text)
|
||||
|
@ -487,9 +487,22 @@ getBestTorrentsTable ::
|
|||
MonadPostgres m,
|
||||
MonadOtel m
|
||||
) =>
|
||||
Maybe (Label "redactedId" Natural) ->
|
||||
Maybe (Label "artistRedactedId" Natural) ->
|
||||
Transaction m Html
|
||||
getBestTorrentsTable artistFilter = do
|
||||
getBestTorrentsTable dat = do
|
||||
fresh <- getBestTorrentsData dat
|
||||
pure $ mkBestTorrentsTable fresh
|
||||
|
||||
getBestTorrentsData ::
|
||||
( MonadTransmission m,
|
||||
MonadThrow m,
|
||||
MonadLogger m,
|
||||
MonadPostgres m,
|
||||
MonadOtel m
|
||||
) =>
|
||||
Maybe (Label "artistRedactedId" Natural) ->
|
||||
Transaction m [TorrentData (Label "percentDone" Percentage)]
|
||||
getBestTorrentsData artistFilter = do
|
||||
bestStale :: [TorrentData ()] <- getBestTorrents GetBestTorrentsFilter {onlyArtist = artistFilter, onlyDownloaded = False}
|
||||
actual <-
|
||||
getAndUpdateTransmissionTorrentsStatus
|
||||
|
@ -502,7 +515,7 @@ getBestTorrentsTable artistFilter = do
|
|||
<&> (\t -> (getLabel @"torrentHash" t, t.transmissionInfo))
|
||||
& Map.fromList
|
||||
)
|
||||
let fresh =
|
||||
pure $
|
||||
bestStale
|
||||
-- we have to update the status of every torrent that’s not in tranmission anymore
|
||||
-- TODO I feel like it’s easier (& more correct?) to just do the database request again …
|
||||
|
@ -516,6 +529,9 @@ getBestTorrentsTable artistFilter = do
|
|||
NotInTransmissionYet -> td {torrentStatus = NotInTransmissionYet}
|
||||
NoTorrentFileYet -> td {torrentStatus = NoTorrentFileYet}
|
||||
)
|
||||
|
||||
mkBestTorrentsTable :: [TorrentData (Label "percentDone" Percentage)] -> Html
|
||||
mkBestTorrentsTable fresh = do
|
||||
let localTorrent b = case b.torrentStatus of
|
||||
NoTorrentFileYet -> [hsx|<button hx-post="snips/redacted/getTorrentFile" hx-swap="outerHTML" hx-vals={Enc.encToBytesUtf8 $ Enc.object [("torrent-id", Enc.int b.torrentId)]}>Upload Torrent</button>|]
|
||||
InTransmission info -> [hsx|{info.transmissionInfo.percentDone.unPercentage}% done|]
|
||||
|
@ -551,7 +567,6 @@ getBestTorrentsTable artistFilter = do
|
|||
</tr>
|
||||
|]
|
||||
)
|
||||
pure $
|
||||
[hsx|
|
||||
<table class="table">
|
||||
<thead>
|
||||
|
|
Loading…
Reference in a new issue