aboutsummaryrefslogtreecommitdiff
path: root/Annex.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-11-29 17:05:27 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-11-29 17:30:02 -0400
commit09d49fd8ace467463a83ecaf775cbed24f8fa0bd (patch)
tree496e4cc1c903b7ac7678ffe60e31c682985f6009 /Annex.hs
parent3b3f7512f6d0b91de21f6fcc4aba8897174bc4a8 (diff)
convert importfeed to youtube-dl
Fully working, including --fast/--relaxed. Note that, while git-annex addurl --relaxed is not going to check youtube-dl, I kept git annex importfeed --relaxed checking it. Thinking is that, let's not break people's importfeed cron jobs, and importfeed does not typically have to check a large number of new items, so it's ok if it's a little bit slower when used with youtube playlist feeds. importfeed's behavior is also improved (?) when a feed has links in it to non-media files. Before, those were skipped. Now, the content of the link is downloaded. This had to be done, because trying to use youtube-dl is slow, and if those were skipped, it would have to check every time importfeed was run. While this behavior change may not be desirable for some feeds, that intersperse links to web pages with enclosures, it will be desirable for other feeds, that have non-enclosure directy links to media files. Remove old quvi modules. This commit was sponsored by Øyvind Andersen Holm.
Diffstat (limited to 'Annex.hs')
-rw-r--r--Annex.hs3
1 files changed, 0 insertions, 3 deletions
diff --git a/Annex.hs b/Annex.hs
index 32a303239..427c479d8 100644
--- a/Annex.hs
+++ b/Annex.hs
@@ -64,7 +64,6 @@ import Types.LockCache
import Types.DesktopNotify
import Types.CleanupActions
import qualified Database.Keys.Handle as Keys
-import Utility.Quvi (QuviVersion)
import Utility.InodeCache
import Utility.Url
@@ -134,7 +133,6 @@ data AnnexState = AnnexState
, errcounter :: Integer
, unusedkeys :: Maybe (S.Set Key)
, tempurls :: M.Map Key URLString
- , quviversion :: Maybe QuviVersion
, existinghooks :: M.Map Git.Hook.Hook Bool
, desktopnotify :: DesktopNotify
, workers :: [Either AnnexState (Async AnnexState)]
@@ -190,7 +188,6 @@ newState c r = do
, errcounter = 0
, unusedkeys = Nothing
, tempurls = M.empty
- , quviversion = Nothing
, existinghooks = M.empty
, desktopnotify = mempty
, workers = []