Rename receive mode "downloads_dir" to the OnionShare "data_dir"

4 files changed, 9 insertions, 9 deletions

diff --git a/onionshare/__init__.py b/onionshare/__init__.py
index 0d064639..2f44c846 100644
--- a/onionshare/__init__.py
+++ b/onionshare/__init__.py
@@ -175,7 +175,7 @@ def main(cwd=None):
 
         print('')
         if mode == 'receive':
-            print(strings._('receive_mode_downloads_dir').format(common.settings.get('downloads_dir')))
+            print(strings._('receive_mode_data_dir').format(common.settings.get('data_dir')))
             print('')
             print(strings._('receive_mode_warning'))
             print('')
diff --git a/onionshare/settings.py b/onionshare/settings.py
index 06235198..1570a150 100644
--- a/onionshare/settings.py
+++ b/onionshare/settings.py
@@ -100,7 +100,7 @@ class Settings(object):
             'public_mode': False,
             'slug': '',
             'hidservauth_string': '',
-            'downloads_dir': self.build_default_downloads_dir(),
+            'data_dir': self.build_default_data_dir(),
             'locale': None # this gets defined in fill_in_defaults()
         }
         self._settings = {}
@@ -140,7 +140,7 @@ class Settings(object):
         """
         return os.path.join(self.common.build_data_dir(), 'onionshare.json')
 
-    def build_default_downloads_dir(self):
+    def build_default_data_dir(self):
         """
         Returns the path of the default Downloads directory for receive mode.
         """
@@ -174,9 +174,9 @@ class Settings(object):
             except:
                 pass
 
-        # Make sure downloads_dir exists
+        # Make sure data_dir exists
         try:
-            os.makedirs(self.get('downloads_dir'), exist_ok=True)
+            os.makedirs(self.get('data_dir'), exist_ok=True)
         except:
             pass
 
diff --git a/onionshare/web/receive_mode.py b/onionshare/web/receive_mode.py
index 6985f38a..2b4e8faf 100644
--- a/onionshare/web/receive_mode.py
+++ b/onionshare/web/receive_mode.py
@@ -64,15 +64,15 @@ class ReceiveModeWeb(object):
             now = datetime.now()
             date_dir = now.strftime("%Y-%m-%d")
             time_dir = now.strftime("%H.%M.%S")
-            receive_mode_dir = os.path.join(self.common.settings.get('downloads_dir'), date_dir, time_dir)
+            receive_mode_dir = os.path.join(self.common.settings.get('data_dir'), date_dir, time_dir)
             valid = True
             try:
                 os.makedirs(receive_mode_dir, 0o700)
             except PermissionError:
-                self.web.add_request(self.web.REQUEST_ERROR_DOWNLOADS_DIR_CANNOT_CREATE, request.path, {
+                self.web.add_request(self.web.REQUEST_ERROR_DATA_DIR_CANNOT_CREATE, request.path, {
                     "receive_mode_dir": receive_mode_dir
                 })
-                print(strings._('error_cannot_create_downloads_dir').format(receive_mode_dir))
+                print(strings._('error_cannot_create_data_dir').format(receive_mode_dir))
                 valid = False
             if not valid:
                 flash('Error uploading, please inform the OnionShare user', 'error')
diff --git a/onionshare/web/web.py b/onionshare/web/web.py
index df838df7..c0e9d6b6 100644
--- a/onionshare/web/web.py
+++ b/onionshare/web/web.py
@@ -38,7 +38,7 @@ class Web(object):
     REQUEST_UPLOAD_FILE_RENAMED = 6
     REQUEST_UPLOAD_SET_DIR = 7
     REQUEST_UPLOAD_FINISHED = 8
-    REQUEST_ERROR_DOWNLOADS_DIR_CANNOT_CREATE = 9
+    REQUEST_ERROR_DATA_DIR_CANNOT_CREATE = 9
 
     def __init__(self, common, is_gui, mode='share'):
         self.common = common