Attachment 16715 Details for Bug 6874 – [PASSED QA] Bug 6874: Change filename construction method.

[patch] [PASSED QA] Bug 6874: Change filename construction method.

PASSED-QA-Bug-6874-Change-filename-construction-me.patch (text/plain), 3.02 KB, created by Paul Poulain on 2013-03-22 08:40:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Poulain

Created: 2013-03-22 08:40:00 UTC

Size: 3.02 KB

patch

obsolete

>From 4a28c1900b02698644f2f5a1a74ce7dc83a9a68f Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Wed, 19 Sep 2012 17:08:20 +0200
>Subject: [PATCH] [PASSED QA] Bug 6874: Change filename construction method.
>
>Use <SHA-1>_<filename>. SHA-1 to avoid name clash, filename to make it
>easier to find a file by its name, when not using Koha (direct
>filesystem access).
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>
>Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
>
>Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
>
>Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
>---
> C4/UploadedFiles.pm        |   24 +++++++++++++++++-------
> opac/opac-retrieve-file.pl |    4 +---
> 2 files changed, 18 insertions(+), 10 deletions(-)
>
>diff --git a/C4/UploadedFiles.pm b/C4/UploadedFiles.pm
>index a14b406..246b02b 100644
>--- a/C4/UploadedFiles.pm
>+++ b/C4/UploadedFiles.pm
>@@ -58,6 +58,16 @@ use Encode;
> 
> use C4::Context;
> 
>+sub _get_file_path {
>+    my ($id, $dirname, $filename) = @_;
>+
>+    my $uploadPath = C4::Context->preference('uploadPath');
>+    my $filepath = "$uploadPath/$dirname/${id}_$filename";
>+    $filepath =~ s|/+|/|g;
>+
>+    return $filepath;
>+}
>+
> =head2 GetUploadedFile
> 
>     my $file = C4::UploadedFiles::GetUploadedFile($id);
>@@ -93,6 +103,10 @@ sub GetUploadedFile {
>     my $sth = $dbh->prepare($query);
>     $sth->execute($id);
>     my $file = $sth->fetchrow_hashref;
>+    if ($file) {
>+        $file->{filepath} = _get_file_path($file->{id}, $file->{dir},
>+            $file->{filename});
>+    }
> 
>     return $file;
> }
>@@ -140,13 +154,11 @@ sub UploadFile {
> 
>     # Test if this id already exist
>     my $file = GetUploadedFile($id);
>-    if($file) {
>+    if ($file) {
>         return $file->{id};
>     }
> 
>-    my $upload_path = C4::Context->preference("uploadPath");
>-    my $file_path = "$upload_path/$dir/$filename";
>-    $file_path =~ s#/+#/#;
>+    my $file_path = _get_file_path($id, $dir, $filename);
> 
>     my $out_fh;
>     # Create the file only if it doesn't exist
>@@ -186,9 +198,7 @@ sub DelUploadedFile {
> 
>     my $file = GetUploadedFile($id);
>     if($file) {
>-        my $upload_path = C4::Context->preference("uploadPath");
>-        my $file_path = "$upload_path/$file->{dir}/$file->{filename}";
>-        $file_path =~ s#/+#/#;
>+        my $file_path = $file->{filepath};
>         my $file_deleted = 0;
>         unless( -f $file_path ) {
>             warn "Id $file->{id} is in database but not in filesystem, removing id from database";
>diff --git a/opac/opac-retrieve-file.pl b/opac/opac-retrieve-file.pl
>index 9904199..ddbf1ac 100755
>--- a/opac/opac-retrieve-file.pl
>+++ b/opac/opac-retrieve-file.pl
>@@ -29,9 +29,7 @@ my $id = $input->param('id');
> my $file = C4::UploadedFiles::GetUploadedFile($id);
> exit 1 if not $file;
> 
>-my $upload_path = C4::Context->preference("uploadPath");
>-my $file_path = "$upload_path/$file->{dir}/$file->{filename}";
>-$file_path =~ s#/+#/#;
>+my $file_path = $file->{filepath};
> 
> if( -f $file_path ) {
>     open FH, '<', $file_path or die "Can't open file: $!";
>-- 
>1.7.9.5

Actions: View | Diff | Splinter Review

Attachments on bug 6874: 5439 | 5440 | 5764 | 7114 | 7980 | 8234 | 8468 | 10664 | 10673 | 10863 | 10982 | 11098 | 11634 | 12355 | 12356 | 12357 | 12358 | 14130 | 14131 | 14132 | 14133 | 16343 | 16354 | 16355 | 16356 | 16357 | 16370 | 16693 | 16694 | 16695 | 16696 | 16697 | 16698 | 16699 | 16712 | 16713 | 16714 | 16715 | 16716 | 16717 | 16718 | 16719 | 17368 | 17369 | 18767 | 18768 | 18769 | 18770 | 18771 | 18772 | 18773 | 18774 | 18775 | 18776 | 18777 | 18891 | 18892 | 18893 | 18894 | 20059 | 20060 | 20779 | 21432 | 21433 | 21434 | 21435 | 21436 | 21489 | 21543 | 21546 | 21635 | 21798 | 21799 | 21800 | 21801 | 21802 | 21803 | 23588 | 23589 | 23590 | 23591 | 23607 | 23608 | 23609 | 23610 | 23611 | 23612 | 23613 | 26418 | 26419 | 26420 | 26421 | 26422 | 26423 | 26424 | 26878 | 26879 | 26880 | 26881 | 26882 | 26883 | 26884 | 27114 | 27125 | 27154 | 27155 | 27225 | 30362 | 30363 | 30364 | 30365 | 30366 | 30367 | 30368 | 30369 | 30370 | 30371 | 32384 | 32385 | 32386 | 32387 | 32388 | 32389 | 32390 | 32391 | 32392 | 32393 | 36198 | 36199 | 36200 | 36201 | 36202 | 36203 | 36204 | 36205 | 36206 | 36207 | 36208 | 36209 | 36210 | 36211 | 36213 | 36214 | 36215 | 36216 | 36217 | 36218 | 36219 | 36220 | 36221 | 36222 | 36223 | 36224 | 36225 | 36226 | 36227 | 36228 | 36229 | 36230 | 36231 | 36232 | 37681 | 37682 | 37683 | 37684 | 37685 | 37686 | 37687 | 37688 | 37689 | 37690 | 37691 | 37692 | 37693 | 37694 | 37696 | 37697 | 37698 | 37699 | 37700 | 37701 | 37702 | 37703 | 37704 | 37705 | 37706 | 38911 | 38912 | 38913 | 38914 | 38915 | 38916 | 38917 | 38918 | 38919 | 38920 | 38921 | 38922 | 38923 | 38924 | 38925 | 38926 | 38927 | 38928 | 38929 | 38930 | 38931 | 38932 | 38933 | 38934 | 38935 | 38936 | 39113 | 39114 | 39115 | 39116 | 39117 | 39118 | 39119 | 39120 | 39121 | 39122 | 39123 | 39626 | 39627 | 39628 | 39629 | 39630 | 39631 | 39632 | 39633 | 39634 | 39635 | 39636 | 39637 | 39638 | 41275 | 41276 | 41277 | 41278 | 41279 | 41280 | 41281 | 41282 | 41283 | 41284 | 41285 | 41286 | 41287 | 41288 | 41448 | 41449 | 41450 | 41783