comparison sworduploader.py @ 9:394b4d094767

Give better names to zip file
Remove square brakets from file names

 		temp = False # Delete temp files
 		# If folder
 		if os.path.isdir(data):
 			if args.zip: # If zip option, 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"
+				if args.title != None:
+					zipf = args.title[0].replace(" ","_")+".zip"
+				else:
+					zipf = dataname.replace(" ","_")+".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:
 						if not name.startswith('.'): # Do not upload hidden files, OSX/linux
 							myzip.write(os.path.join(root,name),
-								os.path.relpath(os.path.join(root,name),data))
+								os.path.relpath(os.path.join(root,name),data).replace(" ","_").replace("[","(").replace("]",")")) # Remove spaces and square brakets
 				fileslist.append(zipf)
 				myzip.close()
 				packaging = "http://purl.org/net/sword/package/SimpleZip"
 				type = "SimpleZip"
 				temp = True
 			else: #create a list of files to upload
 				for root, dirs, files in os.walk(data):
 					for name in files:
-						fileslist.append(os.path.join(root,name))
+						if not name.startswith('.'):
+							fileslist.append(os.path.join(root,name))
 				type = "multiple files"
 		elif zipfile.is_zipfile(data): #This is a zip file
 			fileslist.append(data)
 			myzip = zipfile.ZipFile(data)
 			if "mets.xml" in myzip.namelist(): #This is a METS package

 		else:
 			# Send the zip file and let the ingester do its job
 			payload = open(fileslist[0], "rb")
 			if type == "SimpleZip":
 				in_progress = True
+				# FIXME: we don't want to write silly things in dc.description!
 			else:
 				in_progress = False
 			try:
 				deposit_receipt = c.create(col_iri = collection.href,
 					payload = payload,