Compare commits
6 Commits
899e88fc7d
...
master
Author | SHA1 | Date |
---|---|---|
Rachel Lambda Samuelsson | 98e7894113 | |
Rachel Lambda Samuelsson | d01d2b3b0f | |
Rachel Lambda Samuelsson | 7e86e27185 | |
Rachel Lambda Samuelsson | a5623c6b6b | |
Rachel Lambda Samuelsson | 0d872835a4 | |
Rachel Lambda Samuelsson | ff28ae4148 |
|
@ -20,7 +20,7 @@ errorPage msg = [r|
|
|||
<h1>viddl</h1>
|
||||
<p>|] <> (TL.fromStrict (sanitize (TL.toStrict msg))) <> [r|</p>
|
||||
<hr>
|
||||
<p>viddl is free <a href="https://github.com/depsterr/viddl">open source</a> software and is powered by <a href="https://yt-dl.org/">youtube-dl</a>.</p>
|
||||
<p>viddl is free <a href="https://githug.xyz/depsterr/viddl">open source</a> software and is powered by <a href="https://yt-dl.org/">youtube-dl</a>.</p>
|
||||
</center>
|
||||
</body>
|
||||
|]
|
||||
|
|
|
@ -48,7 +48,7 @@ indexPage = [r|
|
|||
</tr>
|
||||
</table>
|
||||
<hr>
|
||||
<p>viddl is free <a href="https://github.com/depsterr/viddl">open source</a> software and is powered by <a href="https://yt-dl.org/">youtube-dl</a>.</p>
|
||||
<p>viddl is free <a href="https://githug.xyz/depsterr/viddl">open source</a> software and is powered by <a href="https://yt-dl.org/">youtube-dl</a>.</p>
|
||||
</center>
|
||||
</body>
|
||||
|]
|
||||
|
|
12
src/YTDL.hs
12
src/YTDL.hs
|
@ -80,13 +80,9 @@ ytdl url res = ReaderT $ \cfg -> do
|
|||
pure (Right fileName)
|
||||
else do
|
||||
removeDirectoryRecursive dir
|
||||
pure (Left "An unknown error prevented the output file from being created")
|
||||
(pure . Left) "An unknown error prevented the output file from being created"
|
||||
|
||||
(ExitFailure status) -> pure (Left (concat ["execution failed with status '"
|
||||
, show status
|
||||
, "' <pre><code>"
|
||||
, out, err
|
||||
, "' </pre></code>"
|
||||
]))
|
||||
(ExitFailure status) ->
|
||||
pure . Left $ "execution failed with status " ++ show status ++ ": " ++ out ++ ", " ++ err
|
||||
|
||||
_ -> pure (Left "Unable to spawn process for downloading")
|
||||
_ -> (pure . Left) "Unable to create ytdlProcess for downloading video"
|
||||
|
|
|
@ -19,7 +19,7 @@ library
|
|||
, Helpers
|
||||
, Config
|
||||
ghc-options: -Wall -O2 -threaded
|
||||
build-depends: base ^>=4.14.1.0
|
||||
build-depends: base
|
||||
, scotty
|
||||
, text
|
||||
, raw-strings-qq
|
||||
|
@ -42,7 +42,7 @@ executable viddl
|
|||
, YTDL
|
||||
, Config
|
||||
ghc-options: -Wall -O2 -threaded
|
||||
build-depends: base ^>=4.14.1.0
|
||||
build-depends: base
|
||||
, scotty
|
||||
, text
|
||||
, raw-strings-qq
|
||||
|
|
Loading…
Reference in New Issue