[Krang-CVS] [3523] Fixed media bulk upload to ignore MacOSX fluff in upload archives ( __MACOSX directory and contents).

[<sa...@kr...>]

Revision: 3523
Author:   sam
Date:     2007-01-23 18:41:14 -0500 (Tue, 23 Jan 2007)

Log Message:
-----------
Fixed media bulk upload to ignore MacOSX fluff in upload archives (__MACOSX directory and contents).

Modified Paths:
--------------
    trunk/krang/docs/changelog.pod
    trunk/krang/lib/Krang/CGI/Media/BulkUpload.pm

Modified: trunk/krang/docs/changelog.pod
===================================================================
--- trunk/krang/docs/changelog.pod	2007-01-23 22:34:18 UTC (rev 3522)
+++ trunk/krang/docs/changelog.pod	2007-01-23 23:41:14 UTC (rev 3523)
@@ -9,6 +9,11 @@
 
 =item *
 
+Fixed media bulk upload to ignore MacOSX fluff in upload archives
+(__MACOSX directory and contents). [Sam]
+
+=item *
+
 Fixed bug in New Template where it was imposible to clear the category
 selector after making a selection and clicking Save.  [Sam]
 

Modified: trunk/krang/lib/Krang/CGI/Media/BulkUpload.pm
===================================================================
--- trunk/krang/lib/Krang/CGI/Media/BulkUpload.pm	2007-01-23 22:34:18 UTC (rev 3522)
+++ trunk/krang/lib/Krang/CGI/Media/BulkUpload.pm	2007-01-23 23:41:14 UTC (rev 3523)
@@ -384,6 +384,9 @@
     my $path = $File::Find::dir;
     my $file = $_;
     return unless -f $File::Find::name;
+
+    # ignore fluff in MacOSX .zip files
+    return if $path =~ /__MACOSX/;
    
     my $opened_root = $File::Find::topdir; 
     $path =~ s/$opened_root//;