Merge branch 'master' of githug.xyz:depsterr/viddl

src/Templates/Error.hs

@@ -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>
 |]

src/Templates/Index.hs

@@ -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>
 |]

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