fix transferred spelling

Author: johnbradley

ddsc/core/download.py

@@ -327,7 +327,7 @@ def make_download_speed(self, current_time, total_bytes_downloaded):
         return transfer_speed_str(
             current_time=current_time,
             start_time=self.start_time,
-            transfered_bytes=total_bytes_downloaded
+            transferred_bytes=total_bytes_downloaded
         )
 
     def get_download_progress(self):

ddsc/core/projectuploader.py

@@ -453,7 +453,7 @@ def after_run(self, remote_file_data):
             self.local_file.set_remote_values_after_send(remote_file_id,
                                                          remote_hash_dict['algorithm'],
                                                          remote_hash_dict['value'])
-            self.settings.watcher.transferring_item(self.local_file, transfered_bytes=self.local_file.size)
+            self.settings.watcher.transferring_item(self.local_file, transferred_bytes=self.local_file.size)
         else:
             self.settings.watcher.increment_progress()
 

ddsc/core/tests/test_projectuploader.py

@@ -373,4 +373,4 @@ def test_after_run_when_file_is_sent(self):
         cmd.after_run(remote_file_data)
         cmd.file_upload_post_processor.run.assert_called_with(cmd.settings.data_service, remote_file_data)
         cmd.local_file.set_remote_values_after_send.assert_called_with('abc123', 'md5', 'abcdefg')
-        cmd.settings.watcher.transferring_item.assert_called_with(cmd.local_file, transfered_bytes=cmd.local_file.size)
+        cmd.settings.watcher.transferring_item.assert_called_with(cmd.local_file, transferred_bytes=cmd.local_file.size)

ddsc/core/tests/test_util.py

@@ -32,18 +32,18 @@ def test_show_no_waiting(self, mock_transfer_speed_str, mock_stdout):
         mock_transfer_speed_str.return_value = ' @ 100 MB/s'
 
         # replace line with our progress
-        progress_bar.update(percent_done=0, details='sending really_long_filename.txt', transfered_bytes=0)
+        progress_bar.update(percent_done=0, details='sending really_long_filename.txt', transferred_bytes=0)
         progress_bar.show()
         expected = '\rProgress: 0% @ 100 MB/s - sending really_long_filename.txt'
         mock_stdout.write.assert_called_with(expected)
 
         # replace line with our progress (make sure it is long enough to blank out previous line)
-        progress_bar.update(percent_done=10, details='sending short.txt', transfered_bytes=100)
+        progress_bar.update(percent_done=10, details='sending short.txt', transferred_bytes=100)
         progress_bar.show()
         expected = '\rProgress: 10% @ 100 MB/s - sending short.txt              '
         mock_stdout.write.assert_called_with(expected)
 
-        progress_bar.update(percent_done=15, details='sending short.txt', transfered_bytes=50)
+        progress_bar.update(percent_done=15, details='sending short.txt', transferred_bytes=50)
         progress_bar.show()
         expected = '\rProgress: 15% @ 100 MB/s - sending short.txt              '
         mock_stdout.write.assert_called_with(expected)
@@ -61,7 +61,7 @@ def test_show_with_waiting(self, mock_transfer_speed_str, mock_stdout):
         mock_transfer_speed_str.return_value = ' @ 100 MB/s'
 
         # we make some progress
-        progress_bar.update(percent_done=10, details='sending short.txt', transfered_bytes=100)
+        progress_bar.update(percent_done=10, details='sending short.txt', transferred_bytes=100)
         progress_bar.show()
         expected = '\rProgress: 10% @ 100 MB/s - sending short.txt'
         mock_stdout.write.assert_called_with(expected)
@@ -75,7 +75,7 @@ def test_show_with_waiting(self, mock_transfer_speed_str, mock_stdout):
 
         # waiting takes priority over progress updates
         # (we may be able to upload some folders while waiting to upload files)
-        progress_bar.update(percent_done=15, details='sending short.txt', transfered_bytes=50)
+        progress_bar.update(percent_done=15, details='sending short.txt', transferred_bytes=50)
         progress_bar.show()
         expected = '\rProgress: 15% @ 100 MB/s - Waiting for project'
         mock_stdout.write.assert_called_with(expected)
@@ -120,14 +120,14 @@ def test_general_functionality(self, mock_progress_bar):
 
         # pretend we just created a project
         mock_project = Mock(kind=KindType.project_str, path='')
-        progress_printer.transferring_item(item=mock_project, increment_amt=1, transfered_bytes=100)
+        progress_printer.transferring_item(item=mock_project, increment_amt=1, transferred_bytes=100)
         mock_progress_bar.return_value.update.assert_called_with(10, 100, 'sending project')
         mock_progress_bar.return_value.show.assert_called()
         mock_progress_bar.reset_mock()
 
         # pretend we just created a folder
         mock_project = Mock(kind=KindType.folder_str, path='/data')
-        progress_printer.transferring_item(item=mock_project, increment_amt=2, transfered_bytes=200)
+        progress_printer.transferring_item(item=mock_project, increment_amt=2, transferred_bytes=200)
         mock_progress_bar.return_value.update.assert_called_with(30, 300, 'sending data')
         mock_progress_bar.return_value.show.assert_called()
         mock_progress_bar.reset_mock()

ddsc/core/util.py

@@ -71,10 +71,10 @@ def __init__(self, total, msg_verb):
         self.waiting = False
         self.msg_verb = msg_verb
         self.progress_bar = ProgressBar()
-        self.transfered_bytes = 0
+        self.transferred_bytes = 0
         self.total_bytes = 0
 
-    def transferring_item(self, item, increment_amt=1, override_msg_verb=None, transfered_bytes=0):
+    def transferring_item(self, item, increment_amt=1, override_msg_verb=None, transferred_bytes=0):
         """
         Update progress that item is about to be transferred.
         :param item: LocalFile, LocalFolder, or LocalContent(project) that is about to be sent.
@@ -90,8 +90,8 @@ def transferring_item(self, item, increment_amt=1, override_msg_verb=None, trans
         msg_verb = self.msg_verb
         if override_msg_verb:
             msg_verb = override_msg_verb
-        self.transfered_bytes += transfered_bytes
-        self.progress_bar.update(percent_done, self.transfered_bytes, '{} {}'.format(msg_verb, details))
+        self.transferred_bytes += transferred_bytes
+        self.progress_bar.update(percent_done, self.transferred_bytes, '{} {}'.format(msg_verb, details))
         self.progress_bar.show()
 
     def increment_progress(self, amt=1):
@@ -142,20 +142,20 @@ def __init__(self):
         self.line = ''
         self.state = self.STATE_RUNNING
         self.wait_msg = 'Waiting'
-        self.transfered_bytes = 0
+        self.transferred_bytes = 0
         self.start_time = time.time()
 
-    def update(self, percent_done, transfered_bytes, details):
+    def update(self, percent_done, transferred_bytes, details):
         self.percent_done = percent_done
         self.current_item_details = details
-        self.transfered_bytes = transfered_bytes
+        self.transferred_bytes = transferred_bytes
 
     def set_state(self, state):
         self.state = state
 
     def _get_line(self):
         speed = transfer_speed_str(current_time=time.time(), start_time=self.start_time,
-                                   transfered_bytes=self.transfered_bytes)
+                                   transferred_bytes=self.transferred_bytes)
         if self.state == self.STATE_DONE:
             return 'Done: 100%{}'.format(speed)
         details = self.current_item_details
@@ -353,8 +353,8 @@ def wait_for_processes(processes, size, progress_queue, watcher, item):
     while size > 0:
         progress_type, value = progress_queue.get()
         if progress_type == ProgressQueue.PROCESSED:
-            chunk_size, transfered_bytes = value
-            watcher.transferring_item(item, increment_amt=chunk_size, transfered_bytes=transfered_bytes)
+            chunk_size, transferred_bytes = value
+            watcher.transferring_item(item, increment_amt=chunk_size, transferred_bytes=transferred_bytes)
             size -= chunk_size
         elif progress_type == ProgressQueue.START_WAITING:
             watcher.start_waiting()
@@ -462,16 +462,16 @@ def join_with_commas_and_and(items):
         return last_item
 
 
-def transfer_speed_str(current_time, start_time, transfered_bytes):
+def transfer_speed_str(current_time, start_time, transferred_bytes):
     """
     Return transfer speed str based
     :param current_time: float: current time
     :param start_time: float: starting time
-    :param transfered_bytes: int: bytes transferred
+    :param transferred_bytes: int: bytes transferred
     :return: str: end user str
     """
     elapsed_seconds = current_time - start_time
-    if elapsed_seconds > 0 and transfered_bytes > 0:
-        bytes_per_second = float(transfered_bytes) / (elapsed_seconds + 0.5)
+    if elapsed_seconds > 0 and transferred_bytes > 0:
+        bytes_per_second = float(transferred_bytes) / (elapsed_seconds + 0.5)
         return '@ {}/s'.format(humanize_bytes(bytes_per_second))
     return ''