vdr-pictures and pic2mpg

Message ID 47C1E983.7000000@cadsoft.de
State New
Headers

Commit Message

Klaus Schmidinger Feb. 24, 2008, 10:02 p.m. UTC
  On 02/24/08 21:42, Stefan Wagner wrote:
> the pic2mpg script aceptis only files with lower case caracters.
> is it posible to support upper case caracters by default?
> 
> my pictures are named DSCN*.JPG and the script only acepts  DSCN*.jpg.



(untested).

Klaus
  

Comments

Stefan Wagner Feb. 25, 2008, 5:48 a.m. UTC | #1
Klaus Schmidinger <Klaus.Schmidinger@cadsoft.de> wrote:
> On 02/24/08 21:42, Stefan Wagner wrote:
>> the pic2mpg script aceptis only files with lower case caracters.
>> is it posible to support upper case caracters by default?
>> 
>> my pictures are named DSCN*.JPG and the script only acepts  DSCN*.jpg.
> 
> --- PLUGINS/src/pictures/pic2mpg        2008/02/02 11:34:43     1.2
> +++ PLUGINS/src/pictures/pic2mpg        2008/02/24 22:00:18
> @@ -143,7 +143,7 @@
> sub ConvertFile
> {
>   my ($Pict, $Mpeg) = @_;
> -  (my $Type) = $Pict =~ /\.([^\.]*)$/;
> +  (my $Type) = lc($Pict) =~ /\.([^\.]*)$/;
>   if (!defined $PNMCONV{$Type}) {
>      return if ($Ignore);
>      die "unknown file type '$Type': '$Pict'\n";
> 
> 
> (untested).
> 
> Klaus

works fine now with uper and lower case.

stefan@mona:/media/daten/burn$ pic2mpg -v 1 /media/daten/burn/ /media/daten/burn/dest/
./dscn0015.jpg -> /media/daten/burn/dest//./dscn0015.jpg.mpg
./DSCN00051.JPG -> /media/daten/burn/dest//./DSCN00051.JPG.mpg

but wen i call the script with relative paths:
stefan@mona:/media/daten/burn$ pic2mpg -v 1 ./ dest/
./dscn0015.jpg -> dest//./dscn0015.jpg.mpg
./DSCN00051.JPG -> dest//./DSCN00051.JPG.mpg
removing ./DSCN00051.JPG.mpg
removing ./dscn0015.jpg.mpg
dest/: No such file or directory

why will the script remove the files?
they are in dest/ before ending script.

stefan
  
Klaus Schmidinger Feb. 25, 2008, 6:13 p.m. UTC | #2
On 02/25/08 06:48, Stefan Wagner wrote:
> Klaus Schmidinger <Klaus.Schmidinger@cadsoft.de> wrote:
>> On 02/24/08 21:42, Stefan Wagner wrote:
>>> the pic2mpg script aceptis only files with lower case caracters.
>>> is it posible to support upper case caracters by default?
>>>
>>> my pictures are named DSCN*.JPG and the script only acepts  DSCN*.jpg.
>> --- PLUGINS/src/pictures/pic2mpg        2008/02/02 11:34:43     1.2
>> +++ PLUGINS/src/pictures/pic2mpg        2008/02/24 22:00:18
>> @@ -143,7 +143,7 @@
>> sub ConvertFile
>> {
>>   my ($Pict, $Mpeg) = @_;
>> -  (my $Type) = $Pict =~ /\.([^\.]*)$/;
>> +  (my $Type) = lc($Pict) =~ /\.([^\.]*)$/;
>>   if (!defined $PNMCONV{$Type}) {
>>      return if ($Ignore);
>>      die "unknown file type '$Type': '$Pict'\n";
>>
>>
>> (untested).
>>
>> Klaus
> 
> works fine now with uper and lower case.
> 
> stefan@mona:/media/daten/burn$ pic2mpg -v 1 /media/daten/burn/ /media/daten/burn/dest/
> ./dscn0015.jpg -> /media/daten/burn/dest//./dscn0015.jpg.mpg
> ./DSCN00051.JPG -> /media/daten/burn/dest//./DSCN00051.JPG.mpg
> 
> but wen i call the script with relative paths:
> stefan@mona:/media/daten/burn$ pic2mpg -v 1 ./ dest/
> ./dscn0015.jpg -> dest//./dscn0015.jpg.mpg
> ./DSCN00051.JPG -> dest//./DSCN00051.JPG.mpg
> removing ./DSCN00051.JPG.mpg
> removing ./dscn0015.jpg.mpg
> dest/: No such file or directory
> 
> why will the script remove the files?
> they are in dest/ before ending script.

>From the README file:

Just don't make the destination directory a subdirectory of
the source directory, because this would surely lead to problems.

Klaus
  
Stefan Wagner Feb. 25, 2008, 6:59 p.m. UTC | #3
Klaus Schmidinger <Klaus.Schmidinger@cadsoft.de> wrote:
>> stefan@mona:/media/daten/burn$ pic2mpg -v 1 /media/daten/burn/ /media/daten/burn/dest/
>> ./dscn0015.jpg -> /media/daten/burn/dest//./dscn0015.jpg.mpg
>> ./DSCN00051.JPG -> /media/daten/burn/dest//./DSCN00051.JPG.mpg
>> 
>> but wen i call the script with relative paths:
>> stefan@mona:/media/daten/burn$ pic2mpg -v 1 ./ dest/
>> ./dscn0015.jpg -> dest//./dscn0015.jpg.mpg
>> ./DSCN00051.JPG -> dest//./DSCN00051.JPG.mpg
>> removing ./DSCN00051.JPG.mpg
>> removing ./dscn0015.jpg.mpg
>> dest/: No such file or directory
>> 
>> why will the script remove the files?
>> they are in dest/ before ending script.
> 
> From the README file:
> 
> Just don't make the destination directory a subdirectory of
> the source directory, because this would surely lead to problems.

ok, but with relative paths it don't works.

stefan@mona:~/tests$ ls
dest  source
stefan@mona:/tmp$ pic2mpg -v 1 source dest
./DSCN2155.JPG -> dest/./DSCN2155.JPG.mpg
./DSCN2154.JPG -> dest/./DSCN2154.JPG.mpg
removing ./DSCN2155.JPG.mpg
removing ./DSCN2154.JPG.mpg
dest: Datei oder Verzeichnis nicht gefunden

the script will create a dest dir in source (/tmp/source/dest/) and
delete the files after finishing.

the script only works with absolute paths correctly.

stefan
  

Patch

--- PLUGINS/src/pictures/pic2mpg        2008/02/02 11:34:43     1.2
+++ PLUGINS/src/pictures/pic2mpg        2008/02/24 22:00:18
@@ -143,7 +143,7 @@ 
 sub ConvertFile
 {
   my ($Pict, $Mpeg) = @_;
-  (my $Type) = $Pict =~ /\.([^\.]*)$/;
+  (my $Type) = lc($Pict) =~ /\.([^\.]*)$/;
   if (!defined $PNMCONV{$Type}) {
      return if ($Ignore);
      die "unknown file type '$Type': '$Pict'\n";