Zsh Mailing List Archive Messages sorted by: Reverse Date, Date, Thread, Author

Re: [PATCH] remove sed from _ffmpeg

X-seq: zsh-workers 28264
From: Bapt <baptiste.daroussin@xxxxxxxxx>
To: Peter Stephenson <Peter.Stephenson@xxxxxxx>
Subject: Re: [PATCH] remove sed from _ffmpeg
Date: Thu, 16 Sep 2010 14:12:35 +0200
Cc: zsh-workers@xxxxxxx
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=R8JyG1N6IMEWRDQdokoFLGmXY3gG+5TsTMXXvDd8VG8=; b=BJB2vy4WRGaOJi/1IFPwywDWW+PZFld1jvkms/FJNLjxRqJqQDcwPSOJGz5Knlo+Nt HdbR19ZFBPYVbc7JiYKAkQgnxgNff9D0eT8QoycUXVuWMC6XvYC0CnS0RZjzru2hZI/c 3e5vhOT2iWFDdZWL6NDowDBbi4JEhkDE3G2/w=
Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=tMYjqdE47J7aeTg875uKe5cQxwhwfKZEicsy4qxpDyboXVgvzpPYoqS55A83qOEAWv Jm/SDjwTEFcTxTr6qzE7G6qLQiqZZUse0MiS5OkcgvwL8f0HCISkZwcEpAemhjJ+wRIo Rxrh9I1D9lIYqpUmJeRELhVU9jwfNYN63UomQ=
In-reply-to: <20100916100339.04a0f484@xxxxxxxxxxxxxxxxxxxxxxxxx>
List-help: <mailto:zsh-workers-help@zsh.org>
List-id: Zsh Workers List <zsh-workers.zsh.org>
List-post: <mailto:zsh-workers@zsh.org>
Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
References: <20100916083831.GA33761@xxxxxxxxxxxx> <20100916100339.04a0f484@xxxxxxxxxxxxxxxxxxxxxxxxx>

On Thu, Sep 16, 2010 at 10:03:39AM +0100, Peter Stephenson wrote:
> On Thu, 16 Sep 2010 10:38:31 +0200
> Baptiste Daroussin <baptiste.daroussin@xxxxxxxxx> wrote:
> > Here is a patch to remove sed from _ffmpeg.
> 
> I couldn't get this to apply and it looks a bit strange... the altered line
> in _ffmpeg_formats doesn't appear to have a command or assignment on it
> any more.

Sorry I made a mistale in _ffmpeg_formats which is fixed by the following patch.

The patch is made using the latest git from sourceforge (git diff)

regards,
Bapt

> 
> -- 
> Peter Stephenson <pws@xxxxxxx>            Software Engineer
> Tel: +44 (0)1223 692070                   Cambridge Silicon Radio Limited
> Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, UK
> 
> 
> Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom

diff --git a/Completion/Unix/Command/_ffmpeg b/Completion/Unix/Command/_ffmpeg
index 7c0660e..1c57e3b 100644
--- a/Completion/Unix/Command/_ffmpeg
+++ b/Completion/Unix/Command/_ffmpeg
@@ -18,24 +18,24 @@ _ffmpeg_presets() {
 
 _ffmpeg_acodecs() {
     local acodecs
-    acodecs=($(ffmpeg -codecs 2>/dev/null | sed -n '/^ .[E ]A/ {s/^ .......//; s/ .*//p;}'))
+    acodecs=(${${(M)${(f)"$(ffmpeg -codecs 2>/dev/null)"}:#[[:space:]][D[:space:]][E[:space:]]A[S[:space:]][D[:space:]][T[:space:]][[:space:]][^[:space:]]##*}//(#b)????????([^[:space:]]##)*/$match[1]})
     _ffmpeg_compadd 'force audio codec (''copy'' to copy stream)' acodecs ''
 }
 
 _ffmpeg_vcodecs() {
     local vcodecs
-    vcodecs=($(ffmpeg -codecs 2>/dev/null | sed -n '/^ .[E ]V/ {s/^ .......//; s/ .*//p;}'))
+    vcodecs=(${${(M)${(f)"$(ffmpeg -codecs 2>/dev/null)"}:#[[:space:]][D[:space:]][E[:space:]]V[S[:space:]][D[:space:]][T[:space:]][[:space:]][^[:space:]]##*}//(#b)????????([^[:space:]]##)*/$match[1]})
     _ffmpeg_compadd 'force video codec (''copy'' to copy stream)' vcodecs ''
 }
 
 _ffmpeg_formats() {
     local formats
-    formats=($(ffmpeg -formats 2>/dev/null | sed -e '1,/--/d' -e 's/^....//' -e 's/ .*//' | tr , '\n' | sort | uniq))
+    formats=(${(ou)${=${(s:,:)${${(M)${(f)"$(ffmpeg -formats 2>/dev/null)"}:#[[:space:]][D[:space:]][E[:space:]][[:space:]][^[:space:]]##*}//(#b)????([^[:space:]]##)*/$match[1]}}}})
     _ffmpeg_compadd 'force format' formats ''
 }
 
 _ffmpeg_list_pix_fmts() {
-    ffmpeg -pix_fmts 2>/dev/null | sed -e '1,/-----/d' -e 's/^......//' -e 's/ .*//'
+    print -l ${${(M)${(f)"$(ffmpeg -pix_fmts 2>/dev/null)"}:#[I.]*}//(#b)??????([^[:space:]]##)*/$match[1]}
 }
 
 _ffmpeg_pix_fmts() {
@@ -46,7 +46,7 @@ _ffmpeg_pix_fmts() {
 
 _ffmpeg_bsfs() {
     local bsfs
-    bsfs=($(ffmpeg -bsfs 2>/dev/null | sed 1d))
+    bsfs=(${${(f)"$(ffmpeg -bsfs 2>/dev/null)"}:#*:})
     _ffmpeg_compadd 'set bitstream filter' bsfs ''
 }

Attachment: pgpDQLtBEyIBd.pgp
Description: PGP signature

References:
- [PATCH] remove sed from _ffmpeg
  - From: Baptiste Daroussin
- Re: [PATCH] remove sed from _ffmpeg
  - From: Peter Stephenson

Messages sorted by: Reverse Date, Date, Thread, Author