Merge branch 'master' of ssh://git-annex.branchable.com
This commit is contained in:
commit
6eed4b7453
10 changed files with 41 additions and 8 deletions
|
@ -0,0 +1,25 @@
|
|||
### Please describe the problem.
|
||||
|
||||
[[git-annex-importfeed]] cannot reliably import feeds from <pyvideo.org/category/65/pycon-us-2015/rss>
|
||||
|
||||
### What steps will reproduce the problem?
|
||||
|
||||
git annex importfeed pyvideo.org/category/65/pycon-us-2015/rss
|
||||
|
||||
### What version of git-annex are you using? On what operating system?
|
||||
|
||||
5.20141125
|
||||
|
||||
### Please provide any additional information below.
|
||||
|
||||
It seems related to the fact that the `enclosure` XML item links to the youtube page instead of the actual video, which sounds a little crazy... so maybe the feed is just wrong and this is invalid.
|
||||
|
||||
In [this pull request to the conference proceedings repo](https://github.com/RichiH/conference_proceedings/pull/42), i hacked around that problem with a [simple loop](https://github.com/anarcat/conference_proceedings/blob/pycon/PyCon/README.md):
|
||||
|
||||
curl -s http://pyvideo.org/category/65/pycon-us-2015/rss | xmllint --xpath '//enclosure/@url' - | sed 's/url=/\n/g' | xargs git annex addurl --fast
|
||||
|
||||
xargs doesn't actually work so well because every once in a while, youtube will return a 403 and the whole pipeline crumbles to the ground. I found this to work better:
|
||||
|
||||
curl -s http://pyvideo.org/category/65/pycon-us-2015/rss | xmllint --xpath '//enclosure/@url' - | sed 's/url="/\n/g;s/"//' | while read url ; do git annex addurl --fast $url ; done
|
||||
|
||||
but it's pretty ugly! --[[anarcat]]
|
|
@ -0,0 +1,7 @@
|
|||
[[!comment format=mdwn
|
||||
username="eigengrau"
|
||||
subject="comment 1"
|
||||
date="2015-05-30T12:30:39Z"
|
||||
content="""
|
||||
AFAIK absent files are supposed to be symlinks, even in direct mode. Once you “git annex get“ the files, the will be immediately unlocked. Only on VFAT file-systems (which do not support symlinks), absent files will have 0 byte placeholders. You might be able to force placeholders with the “annex.crippledfilesystem“ config option, but I’m not sure how you would enact it or whether that’s desirable.
|
||||
"""]]
|
|
@ -0,0 +1 @@
|
|||
Is it possible to download youtube videos in mp4 format by default with importfeed. Without any options git annex often downloads the webm format.
|
|
@ -19,7 +19,7 @@ safe to do so.
|
|||
* `--from=remote`
|
||||
|
||||
Rather than dropping the content of files in the local repository,
|
||||
this option can specifiy a remote from which the files'
|
||||
this option can specify a remote from which the files'
|
||||
contents should be removed.
|
||||
|
||||
* `--auto`
|
||||
|
|
|
@ -24,7 +24,7 @@ To make the import process add metadata to the imported files from the feed,
|
|||
|
||||
* `--force`
|
||||
|
||||
Force downoading items it's seen before.
|
||||
Force downloading items it's seen before.
|
||||
|
||||
* `--template`
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ nothing is output, and it exits nonzero.
|
|||
Enable batch mode, in which a line containing the filename is read from
|
||||
stdin, the key is output to stdout (with a trailing newline), and repeat.
|
||||
|
||||
Note that is there is no key corresponding to the file, an empty line is
|
||||
Note that if there is no key corresponding to the file, an empty line is
|
||||
output to stdout instead.
|
||||
|
||||
# SEE ALSO
|
||||
|
|
|
@ -38,7 +38,7 @@ first "/~/" or "/~user/" is expanded to the specified home directory.
|
|||
This checks if all specified keys are present in the annex,
|
||||
and exits zero if so.
|
||||
|
||||
Exits 1 if the key is certianly not present in the annex.
|
||||
Exits 1 if the key is certainly not present in the annex.
|
||||
Exits 100 if it's unable to tell (perhaps the key is in the process of
|
||||
being removed from the annex).
|
||||
|
||||
|
|
|
@ -49,7 +49,7 @@ by running "git annex sync" on the remote.
|
|||
syncing with. This behavior can be overridden by configuring the preferred
|
||||
content of a repository. See [[git-annex-preferred-content]](1).
|
||||
|
||||
To make two repositories have the same set of fies, you should use
|
||||
To make two repositories have the same set of files, you should use
|
||||
[[git-annex-mirror]](1) instead of this flag.
|
||||
|
||||
* `--message=msg`
|
||||
|
|
|
@ -10,8 +10,8 @@ See [[tips/using_the_web_as_a_special_remote]] for usage examples.
|
|||
git-annex uses [aria2](http://aria2.sourceforge.net/) to download torrents.
|
||||
|
||||
If git-annex is not built using the haskell torrent library to parse
|
||||
torrents, it also needs the needs the `btshowmetainfo` program, from
|
||||
either bittornado or the original BitTorrent client.
|
||||
torrents, it also needs the `btshowmetainfo` program, from either
|
||||
bittornado or the original BitTorrent client.
|
||||
|
||||
## notes
|
||||
|
||||
|
|
|
@ -41,6 +41,6 @@ The following tuning parameters are available:
|
|||
Use just one level of hash directories in the git-annex branch,
|
||||
instead of the default two levels.
|
||||
|
||||
Note that git-annex will automatically propigate these setting to
|
||||
Note that git-annex will automatically propagate these settings to
|
||||
`.git/config` for tuned repositories. You should never directly change
|
||||
these settings in `.git/config`
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue