fixes #13

Author: dschreij

.gitignore

@@ -78,4 +78,6 @@ token.json
 resources/iconthemes/
 
 # Universal build script
-build_all
+build_all
+
+.vscode

QOpenScienceFramework/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.2.2"
+__version__ = "1.2.3"
 __author__ = "Daniel Schreij"
 
 import os

QOpenScienceFramework/manager.py

@@ -236,7 +236,7 @@ def buffer_network_request(func):
 		def func_wrapper(inst, *args, **kwargs):
 			if inst.logged_in_user:
 				# Create an internal ID for this request
-				request_id=uuid.uuid4()
+				request_id = uuid.uuid4()
 				current_request = lambda: func(inst, *args, **kwargs)
 				# Add tuple with current user, and request to be performed
 				# to the pending request dictionary
@@ -842,10 +842,17 @@ def __reply_finished(self, callback, *args, **kwargs):
 				self.__close_file_handles(*args, **kwargs)
 				reply.deleteLater()
 				return
+
+			# Truncate the temp file. This will delete any contents that have been streamed 
+			# to the file during the redirect request.
+			if 'tmp_file' in kwargs and isinstance(kwargs['tmp_file'], QtCore.QTemporaryFile):
+				kwargs['tmp_file'].resize(0)
+
 			# Perform another request with the redirect_url and pass on the callback
 			redirect_url = reply.attribute(request.RedirectionTargetAttribute)
 			# For now, the redirects only work for GET operations (but to my
 			# knowledge, those are the only operations they occur for)
+
 			if reply.operation() == self.GetOperation:
 				self.get(redirect_url, callback, *args, **kwargs)
 		else:
@@ -906,8 +913,6 @@ def __download(self, reply, download_url, *args, **kwargs):
 				size = progressDialog['filesize']
 			except KeyError as e:
 				raise KeyError("progressDialog missing field {}".format(e))
-			icon = QtGui.QIcon()
-			title = _("Transfer in progress")
 			progress_indicator = self.__create_progress_dialog(text, size)
 			kwargs['progressDialog'] = progress_indicator
 			kwargs['downloadProgress'] = self.__transfer_progress

example.py

@@ -18,6 +18,8 @@
 import logging
 import tempfile
 logging.basicConfig(level=logging.INFO)
+from dotenv import load_dotenv
+load_dotenv()
 
 # Required QT classes
 from qtpy import QtWidgets, QtCore
@@ -29,8 +31,8 @@
 from QOpenScienceFramework.compat import *
 
 ####### CONFIGURE THE CLIENT ID AND REDIRECT URI HERE. REGISTER AT OSF.IO ######
-client_id = "<YOUR_CLIENT_ID_HERE>"
-redirect_uri = "<YOUR_REDIRECT_URI_HERE>"
+client_id = os.getenv("CLIENT_ID", "<YOUR_CLIENT_ID_HERE>")
+redirect_uri = os.getenv("REDIRECT_URI", "<YOUR_REDIRECT_URI_HERE>")
 ################################################################################
 
 class InvalidateButton(QtWidgets.QWidget):

setup.py

@@ -27,6 +27,7 @@
 		'python-fileinspector',
 		'requests-oauthlib>=0.6',
 		'qtawesome',
+		'python-dotenv'
 	],
 	include_package_data=True,
 	packages = ['QOpenScienceFramework'],