oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Deprecated WebGUI::Storage::Image. WebGUI::Storage can now do everything

Browse source 
WebGUI::Storage::Image can do.
This commit is contained in:
JT Smith 2008-11-26 16:06:18 +00:00
parent 2b3e88fd63
commit ee84cc7611
34 changed files with 399 additions and 470 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/WebGUI/Asset/Event.pm
View file

@ -20,7 +20,7 @@ use Carp qw(croak);
use WebGUI::International;
use WebGUI::Asset::Template;
use WebGUI::Form;
use WebGUI::Storage::Image;
use WebGUI::Storage;
use Storable;
use base 'WebGUI::Asset';
@ -1214,10 +1214,10 @@ sub getStorageLocation {
my $self = shift;
unless (exists $self->{_storageLocation}) {
if ($self->get("storageId") eq "") {
$self->{_storageLocation} = WebGUI::Storage::Image->create($self->session);
$self->{_storageLocation} = WebGUI::Storage->create($self->session);
$self->update({storageId=>$self->{_storageLocation}->getId});
} else {
$self->{_storageLocation} = WebGUI::Storage::Image->get($self->session,$self->get("storageId"));
$self->{_storageLocation} = WebGUI::Storage->get($self->session,$self->get("storageId"));
}
}
return $self->{_storageLocation};
@ -1702,7 +1702,7 @@ sub purge {
my $self = shift;
my $sth = $self->session->db->read("select storageId from Event where assetId=?",[$self->getId]);
while (my ($storageId) = $sth->array) {
my $storage = WebGUI::Storage::Image->get($self->session,$storageId);
my $storage = WebGUI::Storage->get($self->session,$storageId);
$storage->delete if defined $storage;
}
$sth->finish;

6
lib/WebGUI/Asset/File/GalleryFile/Photo.pm
View file

@ -26,7 +26,7 @@ use Tie::IxHash;
use WebGUI::DateTime;
use WebGUI::Friends;
use WebGUI::Utility;
use WebGUI::Storage::Image;
use WebGUI::Storage;
=head1 NAME
@ -44,7 +44,7 @@ use WebGUI::Asset::File::GalleryFile::Photo
=head2 Geometry '...' is invalid. Skipping.
makeResolutions will not pass invalid geometries to WebGUI::Storage::Image::resize().
makeResolutions will not pass invalid geometries to WebGUI::Storage::resize().
Valid geometries are one of the following forms:
^\d+$
@ -259,7 +259,7 @@ Image class.
=cut
sub getStorageClass {
return 'WebGUI::Storage::Image';
return 'WebGUI::Storage';
}
#----------------------------------------------------------------------------

4
lib/WebGUI/Asset/File/Image.pm
View file

@ -16,7 +16,7 @@ package WebGUI::Asset::File::Image;
use strict;
use base 'WebGUI::Asset::File';
use WebGUI::Storage::Image;
use WebGUI::Storage;
use WebGUI::HTMLForm;
use WebGUI::Utility;
use WebGUI::Form::Image;
@ -189,7 +189,7 @@ Returns the class name of the WebGUI::Storage we should use for this asset.
=cut
sub getStorageClass {
return 'WebGUI::Storage::Image';
return 'WebGUI::Storage';
}
#-------------------------------------------------------------------

6
lib/WebGUI/Asset/FilePile.pm
View file

@ -19,7 +19,7 @@ use WebGUI::Asset;
use WebGUI::Asset::File;
use WebGUI::Asset::File::Image;
use WebGUI::SQL;
use WebGUI::Storage::Image;
use WebGUI::Storage;
use WebGUI::TabForm;
use WebGUI::Utility;
@ -151,10 +151,10 @@ sub editSave {
##This is a hack. File uploads should go through the WebGUI::Form::File API
my $tempFileStorageId = WebGUI::Form::File->new($self->session,{name => 'file'})->getValue;
my $tempStorage = WebGUI::Storage::Image->get($self->session, $tempFileStorageId);
my $tempStorage = WebGUI::Storage->get($self->session, $tempFileStorageId);
foreach my $filename (@{$tempStorage->getFiles}) {
#my $storage = WebGUI::Storage::Image->create($self->session);
#my $storage = WebGUI::Storage->create($self->session);
#$storage->addFileFromFilesystem($tempStorage->getPath($filename));
#$storage->setPrivileges($self->getParent->get("ownerUserId"),$self->getParent->get("groupIdView"),$self->getParent->get("groupIdEdit"));

8
lib/WebGUI/Asset/Post.pm
View file

@ -27,7 +27,7 @@ use WebGUI::Mail::Send;
use WebGUI::Operation;
use WebGUI::Paginator;
use WebGUI::SQL;
use WebGUI::Storage::Image;
use WebGUI::Storage;
use WebGUI::User;
use WebGUI::Utility;
use WebGUI::VersionTag;
@ -351,7 +351,7 @@ sub getAvatarUrl {
#Get avatar field, storage Id.
my $storageId = $user->profileField("avatar");
return '' unless $storageId;
my $avatar = WebGUI::Storage::Image->get($self->session,$storageId);
my $avatar = WebGUI::Storage->get($self->session,$storageId);
my $avatarUrl = '';
if ($avatar) {
#Get url from storage object.
@ -476,10 +476,10 @@ sub getStorageLocation {
my $self = shift;
unless (exists $self->{_storageLocation}) {
if ($self->get("storageId") eq "") {
$self->{_storageLocation} = WebGUI::Storage::Image->create($self->session);
$self->{_storageLocation} = WebGUI::Storage->create($self->session);
$self->update({storageId=>$self->{_storageLocation}->getId});
} else {
$self->{_storageLocation} = WebGUI::Storage::Image->get($self->session,$self->get("storageId"));
$self->{_storageLocation} = WebGUI::Storage->get($self->session,$self->get("storageId"));
}
}
return $self->{_storageLocation};

14
lib/WebGUI/Asset/Sku/Product.pm
View file

@ -15,7 +15,7 @@ use Tie::CPHash;
use Tie::IxHash;
use WebGUI::Cache;
use WebGUI::HTMLForm;
use WebGUI::Storage::Image;
use WebGUI::Storage;
use WebGUI::SQL;
use WebGUI::Utility;
use JSON;
@ -443,11 +443,11 @@ sub getQuantityAvailable {
=head2 getThumbnailUrl ( [$store] )
Return a URL to the thumbnail for an image stored in this Product by creating
a WebGUI::Storage::Image object and calling its getThumbnailUrl method.
a WebGUI::Storage object and calling its getThumbnailUrl method.
=head3 $store
This should be a WebGUI::Storage::Image object. If it is not defined,
This should be a WebGUI::Storage object. If it is not defined,
then by default getThumbnailUrl will attempt to look up the URL for
the 'image1' property.
@ -463,7 +463,7 @@ sub getThumbnailUrl {
return $store->getThumbnailUrl($store->getFiles->[0]);
}
elsif ($self->get('image1')) {
$store = WebGUI::Storage::Image->get($self->session, $self->get('image1'));
$store = WebGUI::Storage->get($self->session, $self->get('image1'));
return $store->getThumbnailUrl($store->getFiles->[0]);
}
else {
@ -1451,19 +1451,19 @@ sub view {
}
#---image1
if ($image1) {
my $file = WebGUI::Storage::Image->get($session,$image1);
my $file = WebGUI::Storage->get($session,$image1);
$var{thumbnail1} = $self->getThumbnailUrl($file);
$var{image1} = $self->getFileUrl($file);
}
#---image2
if ($image2) {
my $file = WebGUI::Storage::Image->get($session,$image2);
my $file = WebGUI::Storage->get($session,$image2);
$var{thumbnail2} = $self->getThumbnailUrl($file);
$var{image2} = $self->getFileUrl($file);
}
#---image3
if ($image3) {
my $file = WebGUI::Storage::Image->get($session,$image3);
my $file = WebGUI::Storage->get($session,$image3);
$var{thumbnail3} = $self->getThumbnailUrl($file);
$var{image3} = $self->getFileUrl($file);
}

2
lib/WebGUI/Asset/Template.pm
View file

@ -579,7 +579,7 @@ sub www_styleWizard {
my $logo;
my $logoContent = '';
if ($storageId) {
my $storage = WebGUI::Storage::Image->get($self->session,$storageId);
my $storage = WebGUI::Storage->get($self->session,$storageId);
$logo = $self->addChild({
className=>"WebGUI::Asset::File::Image",
title=>join(' ', $form->get("heading"), $i18n->get('logo')),

8
lib/WebGUI/Asset/Wobject/Article.pm
View file

@ -16,7 +16,7 @@ use WebGUI::International;
use WebGUI::Cache;
use WebGUI::Paginator;
use WebGUI::Asset::Wobject;
use WebGUI::Storage::Image;
use WebGUI::Storage;
our @ISA = qw(WebGUI::Asset::Wobject);
@ -173,10 +173,10 @@ sub getStorageLocation {
my $self = shift;
unless (exists $self->{_storageLocation}) {
if ($self->get("storageId") eq "") {
$self->{_storageLocation} = WebGUI::Storage::Image->create($self->session);
$self->{_storageLocation} = WebGUI::Storage->create($self->session);
$self->update({storageId=>$self->{_storageLocation}->getId});
} else {
$self->{_storageLocation} = WebGUI::Storage::Image->get($self->session,$self->get("storageId"));
$self->{_storageLocation} = WebGUI::Storage->get($self->session,$self->get("storageId"));
}
}
return $self->{_storageLocation};
@ -240,7 +240,7 @@ sub purge {
my $self = shift;
my $sth = $self->session->db->read("select storageId from Article where assetId=?",[$self->getId]);
while (my ($storageId) = $sth->array) {
my $storage = WebGUI::Storage::Image->get($self->session,$storageId);
my $storage = WebGUI::Storage->get($self->session,$storageId);
$storage->delete if defined $storage;
}
$sth->finish;

4
lib/WebGUI/Asset/Wobject/Poll.pm
View file

@ -20,7 +20,7 @@ use WebGUI::User;
use WebGUI::Utility;
use WebGUI::Asset::Wobject;
use WebGUI::Image::Graph;
use WebGUI::Storage::Image;
use WebGUI::Storage;
use JSON;
our @ISA = qw(WebGUI::Asset::Wobject);
@ -461,7 +461,7 @@ sub view {
$graph->draw;
my $storage = WebGUI::Storage::Image->createTemp($self->session);
my $storage = WebGUI::Storage->createTemp($self->session);
my $filename = 'poll'.$self->session->id->generate.".png";
$graph->saveToStorageLocation($storage, $filename);