tracefile: single char dir (/a/) processed correctly.

This commit is contained in:
Ole Tange 2020-03-21 14:11:17 +01:00
parent 60744cc445
commit 1111353240
4 changed files with 12 additions and 3 deletions

View file

@ -14,6 +14,8 @@ export -f doit
# Test 2 char dir # Test 2 char dir
mkdir -p tt/tt mkdir -p tt/tt
# Test 1 char dir
mkdir -p t/1/2/3
parallel -vj1 doit \ parallel -vj1 doit \
::: '' -l -u \ ::: '' -l -u \
::: tt/tt/../tt/test.img `pwd`/tt/tt/../tt/test.img | grep test.img ::: tt/tt/../tt/test.img `pwd`/tt/tt/../tt/test.img t/1/../1/2/3/test.img `pwd`/t/1/../1/2/3/test.img | grep test.img

View file

@ -279,10 +279,10 @@ while(<IN>) {
my $addinfo = $5; my $addinfo = $5;
# Relative to $dir # Relative to $dir
$file =~ s:^([^/]):$dir/$1:; $file =~ s:^([^/]):$dir/$1:;
$file =~ s:/./:/:g; # /./ => / $file =~ s:/\./:/:g; # /./ => /
$file =~ s:/[^/]+/\.\./:/:g; # /foo/../ => / $file =~ s:/[^/]+/\.\./:/:g; # /foo/../ => /
# Match files in $PWD or starting with ./ # Match files in $PWD or starting with ./
my $local = ($file =~ m<^(\Q$ENV{'PWD'}\E|\./)>); my $local = defined $ENV{'PWD'} && ($file =~ m<^(\Q$ENV{'PWD'}\E|\./)>);
my $read = readfunc($function,$addinfo); my $read = readfunc($function,$addinfo);
my $write = writefunc($function,$addinfo); my $write = writefunc($function,$addinfo);
my $print = 1; my $print = 1;

View file

@ -103,6 +103,8 @@ update_list() {
-type f -printf '%s\t%p\n') | -type f -printf '%s\t%p\n') |
# Sort by size # Sort by size
sort -rn | sort -rn |
# Uniq
uniq |
# Remove size column # Remove size column
perl -pe 's/^\S+\t//' > "$vidlist".$$ perl -pe 's/^\S+\t//' > "$vidlist".$$
# Replace old vidlist with new # Replace old vidlist with new

View file

@ -28,6 +28,11 @@ downloaded file exists, it is played by B<vlc>.
Use tor proxy to download. It assumes you are running a tor proxy on Use tor proxy to download. It assumes you are running a tor proxy on
127.0.0.1:9050. 127.0.0.1:9050.
=item B<--kodi>
Play video using remote B<kodi> server.
=back =back