comparison sworduploader.py @ 3:c1918aa337c4

v0.2 small bug fixes

 #!usr/bin/env/ python
 
-""" SWORD2 DSpace bulk uploader - v0.1
+""" SWORD2 DSpace bulk uploader - v0.2
 
 A python script to submit large numbers of files to a SWORD2-compatible repository, specifically DSpace 1.8x.
 Built on the SWORD2 python client library: https://bitbucket.org/beno/python-sword2/overview
 
 Dependencies:

 			user_name = args.user_name[0]
 			print "DSpace Username: ",user_name
 		user_pass = getpass.getpass("DSpace password:")
 		# Connect to the server
 		c = Connection(dspaceurl, user_name=user_name, user_pass=user_pass,keep_history=False)
+		
 		# Get service document
 		try:
 			c.get_service_document()
-		except: # Could be Forbidden if the exception was raised
+		except: # Server error
+			print "Server unreachable!"
+			break
+		if c.sd != None:
+			connected = True
+		else:
 			attempts-=1
 			print "Incorrect username and/or password"
-		if c.sd != None:
-			connected = True
+			
 			
 	if connected:
 		# List available collections
 		print "------------------------"
 		print "Welcome to the ",c.workspaces[0][0], "repository"

 			temp = False
 		elif os.path.isfile(data): # This is a single file
 			dataname = os.path.basename(data)
 			zipf = os.path.splitext(dataname)[0]+".zip"
 			myzip = zipfile.ZipFile(zipf, "w")
-			myzip.write(data)
+			myzip.write(data,os.path.basename(data))
 			myzip.close()
-		elif os.path.isdir(data): # This is a directory, zip all the files and maintain the structure!
+		elif os.path.isdir(data): # This is a directory, zip all the files and maintain the structure, but start from the base only...
 			dataname = os.path.basename(os.path.normpath(data))
 			zipf = dataname+".zip"
 			myzip = zipfile.ZipFile(zipf, "w")
 			# get the directory structure
+			print "Creating a zip archive for submission..."
 			for root, dirs, files in os.walk(data):
 				for name in files:
-					myzip.write(os.path.join(root,name))
+					myzip.write(os.path.join(root,name),
+						os.path.relpath(os.path.join(root,name),data))
 			myzip.close()
 		else:
 			print "Couldn't find the data."
 			sys.exit()
 		

 			packaging = "http://purl.org/net/sword/package/SimpleZip"
 			type = "SimpleZip"
 		
 		print "------------------------"
 		print "This is a ",type," submission"
+		print "Uploading files..."
 		myzip.close()
 
 		payload = open(zipf, "rb")
 		try:
 			receipt_dep = c.create(col_iri = collection.href,

 		except:
 			print "Error! Couldn't submit the file!"
 			if type == "METS": # Just guessing: not sure this is the problem...
 				print "To submit a METS package, the collection MUST have a workflow!"
 		payload.close()
+		if temp:
+			os.remove(zipf)
 		
 	else: # Failed to connect to SWORDv2 Server
 		print "Couldn't connect to the server."
 		if attempts == 0:
 			print "Invalid credentials entered 3 times."
-	if temp:
-		os.remove(zipf)
 	
 except KeyboardInterrupt:
 	print "------------------------"
 	print "\nSubmission aborted by user."
-