Index: trunk/install/perl/deletemovie.pl =================================================================== --- trunk/install/perl/deletemovie.pl (リビジョン 124) +++ trunk/install/perl/deletemovie.pl (リビジョン 1) @@ -14,11 +14,8 @@ # # -use DBI; -use DBD::Pg; -use DBD::SQLite; $path = $0; $path =~ s/deletemovie.pl$//i; -if ($path ne "./"){ +if ($pwd ne "./"){ push( @INC, "$path"); } @@ -35,5 +32,5 @@ #ファイル名正当性チェック -if ($fname =~ /.m2p$|.m2t$|.MP4$|.aac$/){ +if ($fname =~ /.m2p\z/){ }else{ @@ -43,14 +40,8 @@ } -#DB初期化 -$dbh = DBI->connect($DSN,$DBUser,$DBPass) ||die $DBI::error;; +#ファイル存在チェック -#ファイル存在チェック -my $tid = &mp4filename2tid($fname); -my $mp4dirname = &makemp4dir($tid); if (-e "$recfolderpath/$fname"){ - $filemovepath = $recfolderpath; -}elsif(-e "$mp4dirname/$fname"){ - $filemovepath = $mp4dirname; + }else{ # print "deletemovie file not found.$recfolderpath/$fname\n"; @@ -61,9 +52,9 @@ #既読削除処理 if ($rapidfiledelete > 0){ #./mita/へ移動 - system ("mv $filemovepath/$fname $recfolderpath/mita/"); - &writelog("deletemovie mv filemovepath/$fname $recfolderpath/mita/."); + system ("mv $recfolderpath/$fname $recfolderpath/mita/"); + &writelog("deletemovie mv $recfolderpath/$fname $recfolderpath/mita/."); }else{ #即時削除 - system ("rm $filemovepath/$fname "); - &writelog("deletemovie rm $filemovepath/$fname "); + system ("rm $recfolderpath/$fname "); + &writelog("deletemovie rm $recfolderpath/$fname ");