Menu
▾
▴
[Liveframe-commits] cvs commit: commons/lib/LiveFrame /tmp/cvs-serv7839/commons/lib/LiveFrame/Site.pm Site.pm
|
From: <ix...@us...> - 2001-12-19 05:29:22
|
ixjonez 01/12/18 21:29:21
Modified: lib/LiveFrame Tag: × `¶@h¶@h¶@ À
x¶@x¶@¶@¶@8² 8² ¶@¶@¶@¶@ ¶@ ¶@È©
È© ¨« ¨« Ø° Ø° À¶@À¶@ȶ@ȶ@ж@ж@¨± ¨±
à¶@à¶@è¶@è¶@ð¶@ð¶@8¼ 8¼
/tmp/cvs-serv7839/commons/lib/LiveFrame/Site.pm No
tag Site.pm
Log:
work in progress: add gallery loading and stub adding
Revision Changes Path
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
1.2 +71 -23 commons/lib/LiveFrame/Site.pm
Index: /tmp/cvs-serv7839/commons/lib/LiveFrame/Site.pm
===================================================================
RCS file: /cvsroot/liveframe/commons/lib/LiveFrame/Site.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /tmp/cvs-serv7839/commons/lib/LiveFrame/Site.pm 2001/12/02 09:46:12 1.1
+++ /tmp/cvs-serv7839/commons/lib/LiveFrame/Site.pm 2001/12/19 05:29:21 1.2
@@ -32,33 +32,36 @@
}
sub galleries {
- my $self = shift;
+ my ($self, $include_hidden) = @_;
unless ($self->{galleries}) {
- $self->{galleries} = Tie::IxHash->new();
+ $self->{galleries} = Tie::IxHash->new(),
- my $order_file = $self->order_file();
- open FILE, $order_file or
- die "can't open order file $order_file: $!\n";
- while (defined($_ = <FILE>)) {
- next if /^\s*#/;
- next if /^\s*$/;
- chomp;
-
- my $gallery_path = $self->gallery_path($_);
- next unless -d $gallery_path;
-
- my $gallery = LiveFrame::Gallery->new($gallery_path);
- $self->{galleries}->Push($_ => $gallery);
- }
- close FILE;
+ $self->load_galleries($self->order_file());
+ $self->load_visibility($self->hidden_file);
}
- return $self->{galleries}->Values();
+ my @g = $include_hidden ?
+ $self->{galleries}->Values() :
+ grep { $_->shown() } $self->{galleries}->Values();
+
+ return wantarray ? @g : \@g;
+}
+
+sub gallery {
+ my ($self, $dir) = @_;
+ $self->galleries();
+ return $self->{galleries}->FETCH($dir);
}
## public methods
+sub add_gallery {
+ my ($self, $pos) = @_;
+
+ return 1;
+}
+
sub basename {
my ($self) = @_;
return File::Basename::basename($self->path());
@@ -70,16 +73,61 @@
}
sub num_galleries {
- my ($self) = @_;
+ my ($self, $include_hidden) = @_;
+
$self->galleries();
- return $self->{galleries}->Length();
+
+ my $len = $include_hidden ?
+ $self->{galleries}->Length() :
+ grep { $_->shown() } $self->{galleries}->Values();
+
+ return $len;
}
## private methods
+
+sub load_galleries {
+ my ($self) = @_;
+
+ my $file = $self->order_file();
+ open FILE, $file or
+ die "can't open site file $file: $!\n";
+ while (defined($_ = <FILE>)) {
+ next if /^\s*#/;
+ next if /^\s*$/;
+ chomp;
+
+ my $gallery = LiveFrame::Gallery->new($self, $_);
+ next unless $gallery->exists();
+
+ $gallery->show();
+
+ $self->{galleries}->Push($_ => $gallery);
+ }
+ close FILE;
+
+ return 1;
+}
+
+sub load_visibility {
+ my ($self) = @_;
+
+ my $file = $self->hidden_file();
+ open FILE, $file or
+ die "can't open site file $file: $!\n";
+ while (defined($_ = <FILE>)) {
+ next if /^\s*#/;
+ next if /^\s*$/;
+ chomp;
+
+ my $gallery = $self->gallery($_);
+ next unless $gallery;
+
+ $gallery->hide();
+ }
+ close FILE;
-sub gallery_path {
- my ($self, $name) = @_;
- return File::Spec->catdir($self->path(), $name);
+ return 1;
}
sub hidden_file {
No revision
No revision
1.2 +71 -23 commons/lib/LiveFrame/Site.pm
Index: Site.pm
===================================================================
RCS file: /cvsroot/liveframe/commons/lib/LiveFrame/Site.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Site.pm 2001/12/02 09:46:12 1.1
+++ Site.pm 2001/12/19 05:29:21 1.2
@@ -32,33 +32,36 @@
}
sub galleries {
- my $self = shift;
+ my ($self, $include_hidden) = @_;
unless ($self->{galleries}) {
- $self->{galleries} = Tie::IxHash->new();
+ $self->{galleries} = Tie::IxHash->new(),
- my $order_file = $self->order_file();
- open FILE, $order_file or
- die "can't open order file $order_file: $!\n";
- while (defined($_ = <FILE>)) {
- next if /^\s*#/;
- next if /^\s*$/;
- chomp;
-
- my $gallery_path = $self->gallery_path($_);
- next unless -d $gallery_path;
-
- my $gallery = LiveFrame::Gallery->new($gallery_path);
- $self->{galleries}->Push($_ => $gallery);
- }
- close FILE;
+ $self->load_galleries($self->order_file());
+ $self->load_visibility($self->hidden_file);
}
- return $self->{galleries}->Values();
+ my @g = $include_hidden ?
+ $self->{galleries}->Values() :
+ grep { $_->shown() } $self->{galleries}->Values();
+
+ return wantarray ? @g : \@g;
+}
+
+sub gallery {
+ my ($self, $dir) = @_;
+ $self->galleries();
+ return $self->{galleries}->FETCH($dir);
}
## public methods
+sub add_gallery {
+ my ($self, $pos) = @_;
+
+ return 1;
+}
+
sub basename {
my ($self) = @_;
return File::Basename::basename($self->path());
@@ -70,16 +73,61 @@
}
sub num_galleries {
- my ($self) = @_;
+ my ($self, $include_hidden) = @_;
+
$self->galleries();
- return $self->{galleries}->Length();
+
+ my $len = $include_hidden ?
+ $self->{galleries}->Length() :
+ grep { $_->shown() } $self->{galleries}->Values();
+
+ return $len;
}
## private methods
+
+sub load_galleries {
+ my ($self) = @_;
+
+ my $file = $self->order_file();
+ open FILE, $file or
+ die "can't open site file $file: $!\n";
+ while (defined($_ = <FILE>)) {
+ next if /^\s*#/;
+ next if /^\s*$/;
+ chomp;
+
+ my $gallery = LiveFrame::Gallery->new($self, $_);
+ next unless $gallery->exists();
+
+ $gallery->show();
+
+ $self->{galleries}->Push($_ => $gallery);
+ }
+ close FILE;
+
+ return 1;
+}
+
+sub load_visibility {
+ my ($self) = @_;
+
+ my $file = $self->hidden_file();
+ open FILE, $file or
+ die "can't open site file $file: $!\n";
+ while (defined($_ = <FILE>)) {
+ next if /^\s*#/;
+ next if /^\s*$/;
+ chomp;
+
+ my $gallery = $self->gallery($_);
+ next unless $gallery;
+
+ $gallery->hide();
+ }
+ close FILE;
-sub gallery_path {
- my ($self, $name) = @_;
- return File::Spec->catdir($self->path(), $name);
+ return 1;
}
sub hidden_file {
|
