Changeset 272
- Timestamp:
- 07/01/06 17:11:09 (6 years ago)
- Location:
- MMagic/trunk
- Files:
-
- 1 added
- 2 modified
-
ChangeLog (modified) (1 diff)
-
MMagic.pm (modified) (4 diffs)
-
t/06-conthook.t (added)
Legend:
- Unmodified
- Added
- Removed
-
MMagic/trunk/ChangeLog
r270 r272 1 2006-07-01 NOKUBI Takatsugu <knok@daionet.gr.jp> 2 3 * MMagic.pm (checktype_container): Added container check. 4 (Powerd by CodeFest 2006 Akihabara 5 https://members.fsij.org/trac/codefestakihabara2006) 6 1 7 2006-06-26 NOKUBI Takatsugu <knok@daionet.gr.jp> 2 8 -
MMagic/trunk/MMagic.pm
r270 r272 423 423 '\.htm$' => 'text/html', 424 424 }; 425 # content hook 426 $self->{chook} = {}; 425 427 return bless $self, $class; 426 428 } … … 492 494 } 493 495 496 sub addContainerHook { 497 my $self = shift; 498 my $mtype = shift; 499 my $funcref = shift; 500 $self->{chook}->{$mtype} = $funcref; 501 } 502 494 503 # Not implimented. 495 504 # … … 619 628 return 'application/octet-stream' if (length($data) <= 0); 620 629 630 $mtype = checktype_contents($self, $data); 631 return $mtype unless $mtype eq ""; 632 621 633 $mtype = checktype_magic($self, $data); 622 634 … … 630 642 631 643 return $mtype; 644 } 645 646 sub checktype_container { 647 my $self = shift; 648 my $data = shift; 649 my $href = $self->{chook}; 650 foreach my $mtype (keys %$href) { 651 my $ret = &{$href->{$mtype}}($self, $data); 652 return $ret if $ret ne ""; 653 } 654 return ""; 632 655 } 633 656
