Changeset 199

Timestamp:

2002-10-22 20:58:17 (6 years ago)

Author:

schwa

Message:

FTPHost.upload_if_newer/download_if_newer: Return a flag telling whether
    an upload or download, respectively, was necessary. If yes, return
    `True` else return `False`.

Files:

• trunk/_test_ftputil.py (modified) (8 diffs)
• trunk/ftputil.py (modified) (6 diffs)

trunk/_test_ftputil.py

@@ -30 +30 @@
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-0 2002/04/03 21:50:24
+1 2002/10/22 20:58:17
-
-import unittest
@@ -157 +157 @@
-        except ftputil.RootDirError, exc_obj:
-            self.failIf( isinstance(exc_obj, ftputil.FTPOSError) )
-
+
-    def test_lstat_one_file(self):
-        """Test lstat for a file."""
@@ -179 +179 @@
-        # The comparison with the value 937785600.0 may fail in
-        #  some Python environments. It seems that this depends on
-
-
+
+
+
-        self.assertEqual(stat_result.st_ctime, None)
-
-
+
+
+
+
+
-
-    def test_lstat_via_stat_module(self):
@@ -479 +483 @@
-        host = ftp_host_factory(
-               ftp_host_class=FailingUploadAndDownloadFTPHost)
-
+
+
-        # target is older, so upload
-        host = ftp_host_factory()
-
+
+
-        # check uploaded content
-        # the data which was uploaded has its line endings converted
@@ -491 +497 @@
-        # target doesn't exist, so upload
-        host = ftp_host_factory()
-
+
+
-        remote_file_content = _mock_ftplib.content_of('/home/notthere')
-        self.assertEqual(data, remote_file_content)
@@ -511 +518 @@
-        # target does not exist, so download
-        host = ftp_host_factory(session_factory=BinaryDownloadMockSession)
-
+
+
-        self.compare_and_delete_downloaded_data(local_target)
-
@@ -521 +529 @@
-        # source is newer, so download
-        host = ftp_host_factory(session_factory=BinaryDownloadMockSession)
-
+
+
-        self.compare_and_delete_downloaded_data(local_target)
-
@@ -534 +543 @@
-               ftp_host_class=FailingUploadAndDownloadFTPHost,
-               session_factory=BinaryDownloadMockSession)
-
+
+
-        # remove target file
-        os.unlink(local_target)

trunk/ftputil.py

@@ -30 +30 @@
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-4 2002/05/29 11:50
+5 2002/10/22 20:58
-
-"""
@@ -102 +102 @@
-           'PermanentError', 'ParserError', 'FTPIOError',
-           'RootDirError', 'FTPHost']
-
+
+
+
+
+
+
+
+
-
-
@@ -508 +515 @@
-        Upload a file only if it's newer than the target on the
-        remote host or if the target file does not exist.
+
+        If an upload was necessary, return `True`, else return
+        `False`.
-        """
-        source_timestamp = os.path.getmtime(source)
@@ -517 +527 @@
-        if source_timestamp > target_timestamp:
-            self.upload(source, target, mode)
+            return True
+        else:
+            return False
-
-    def download_if_newer(self, source, target, mode=''):
@@ -522 +535 @@
-        Download a file only if it's newer than the target on the
-        local host or if the target file does not exist.
+
+        If a download was necessary, return `True`, else return
+        `False`.
-        """
-        source_timestamp = self.path.getmtime(source)
@@ -531 +547 @@
-        if source_timestamp > target_timestamp:
-            self.download(source, target, mode)
+            return True
+        else:
+            return False
-
-    def close(self):