Compare commits

..

No commits in common. "master" and "899e88fc7d0f7ea0066bc704ab568d30cb1b83a9" have entirely different histories.

4 changed files with 12 additions and 8 deletions

View File

@ -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://githug.xyz/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://github.com/depsterr/viddl">open source</a> software and is powered by <a href="https://yt-dl.org/">youtube-dl</a>.</p>
</center>
</body>
|]

View File

@ -48,7 +48,7 @@ indexPage = [r|
</tr>
</table>
<hr>
<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>
<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>
</center>
</body>
|]

View File

@ -80,9 +80,13 @@ 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 $ "execution failed with status " ++ show status ++ ": " ++ out ++ ", " ++ err
(ExitFailure status) -> pure (Left (concat ["execution failed with status '"
, show status
, "' <pre><code>"
, out, err
, "' </pre></code>"
]))
_ -> (pure . Left) "Unable to create ytdlProcess for downloading video"
_ -> pure (Left "Unable to spawn process for downloading")

View File

@ -19,7 +19,7 @@ library
, Helpers
, Config
ghc-options: -Wall -O2 -threaded
build-depends: base
build-depends: base ^>=4.14.1.0
, scotty
, text
, raw-strings-qq
@ -42,7 +42,7 @@ executable viddl
, YTDL
, Config
ghc-options: -Wall -O2 -threaded
build-depends: base
build-depends: base ^>=4.14.1.0
, scotty
, text
, raw-strings-qq