rachel/viddl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: rachel:d01d2b3b0f39ff356fe4eb74125965217f7ac926
Branches Tags
rachel:master
..
compare: rachel:a5623c6b6bb5da9238deab6fcfb5342b270c089f
Branches Tags
rachel:master

No commits in common. "d01d2b3b0f39ff356fe4eb74125965217f7ac926" and "a5623c6b6bb5da9238deab6fcfb5342b270c089f" have entirely different histories.
d01d2b3b0f ... a5623c6b6b

3 changed files with 10 additions and 6 deletions
Show Stats Expand all files Collapse all files

2
src/Templates/Error.hs
View File

@ -20,7 +20,7 @@ errorPage msg = [r|
<h1>viddl</h1> <h1>viddl</h1>
<p>|] <> (TL.fromStrict (sanitize (TL.toStrict msg))) <> [r|</p> <p>|] <> (TL.fromStrict (sanitize (TL.toStrict msg))) <> [r|</p>
<hr> <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> </center>
</body> </body>
|] |]

2
src/Templates/Index.hs
View File

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

12
src/YTDL.hs
View File

@ -80,9 +80,13 @@ ytdl url res = ReaderT $ \cfg -> do
pure (Right fileName) pure (Right fileName)
else do else do
removeDirectoryRecursive dir 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) -> (ExitFailure status) -> pure (Left (concat ["execution failed with status '"
pure . Left $ "execution failed with status " ++ show status ++ ": " ++ err , 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")