Changeset 9215 for trunk/Padre/lib/Padre/File/FTP.pm

Timestamp:

11/14/09 04:07:33 (2 years ago)

Author:

Sewi

Message:

Some small fixes and minor changes to Padre::File::FTP

File:

• trunk/Padre/lib/Padre/File/FTP.pm (modified) (5 diffs)

trunk/Padre/lib/Padre/File/FTP.pm

@@ -16 +16 @@
     my $url = shift;
 
-    my $config = Padre->ide->config;
-
     # Create myself
     my $self = bless { filename => $url }, $class;
+
+    # Using the config is optional, tests and other usages should run without
+    my $config = eval { return Padre->ide->config; };
+    if (defined($config)) {
+        $self->{_timeout} = $config->file_ftp_timeout;
+        $self->{_passive} = $config->file_ftp_passive;
+    } else {
+        # Use defaults if we have no config
+        $self->{_timeout} = 60;
+        $self->{_passive} = 1;
+    }
 
     # Don't add a new overall-dependency to Padre:
@@ -72 +81 @@
         Host    => $self->{_host},
         Port    => $self->{_port},
-        Timeout => $config->file_ftp_timeout,
-        Passive => $config->file_ftp_passive,
+        Timeout => $self->{_timeout},
+        Passive => $self->{_passive},
 
         #       Debug => 3, # Enable for FTP-debugging to STDERR
@@ -135 +144 @@
     my $self = shift;
     return if !defined( $self->{_ftp} );
-    return $self->size ? 1 : 0;
+
+    # Cache basename value
+    my $basename = $self->basename;
+
+    for ($self->{_ftp}->ls($self->{_file})) {
+        return 1 if $_ eq $self->{_file};
+        return 1 if $_ eq $basename;
+    }
+
+    # Fallback if ->ls didn't help. A file heaving a size should exist.
+    return 1 if $self->size;
+
+    return 0;
 }
 
@@ -147 +168 @@
 }
 
+# This method should return the dirname to be used inside Padre, not the one
+# used on the FTP-server.
 sub dirname {
     my $self = shift;
 
-    my $dir = $self->{_file};
+    my $dir = $self->{filename};
     $dir =~ s/\/[^\/]*$//;
 
@@ -194 +217 @@
 }
 
+###############################################################################
+### Internal FTP helper functions
+
+sub _ftp_dirname {
+    my $self = shift;
+
+    my $dir = $self->{_file};
+    $dir =~ s/\/[^\/]*$//;
+
+    return $dir;
+}
+
+
 1;