comparison sworduploader.py @ 15:e24aea2d14a4

- v0.6: use server.cfg, maintain dir structure with dir upload

 #!usr/bin/env/ python
 
 """
 
-SWORD2 DSpace bulk uploader - v0.5
+SWORD2 DSpace bulk uploader - v0.6
 
 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 with modifications.
+Built on the SWORD2 python client library: https://github.com/swordapp/python-client-sword2.
 
 Dependencies:
 
 - python 2.X
 
 - sword2 library: https://github.com/swordapp/python-client-sword2 
+
+-----------------------------------
+Updates log:
+
+v0.6: 	- now uploading a directory will also maintain the path structure
+		- introduced a file where to specify the server (server.cfg)
+v0.5: changed the default server to C4DM live server
 
 -----------------------------------
   Centre for Digital Music, Queen Mary, University of London
   Copyright (c) 2012 Marco Fabiani
 

 parser.add_argument("--username", dest="user_name", type=str,nargs=1, help="DSpace username.")
 parser.add_argument("--title", dest="title", type=str,nargs=1, help="Title (ignored for METS packages).")
 parser.add_argument("--author", dest="author", type=str,nargs="+", help="Author(s) (ignored for METS packages). Accepts multiple entries in the format \"Surname, Name\"")
 parser.add_argument("--date", dest="date", type=str,nargs=1, help="Date of creation (string) (ignored for METS packages).")
 parser.add_argument("--zip", action="store_true",dest="zip",default=False, help="If \"data\" is a directory, compress it and post it as a single file. The zip file will be saved along with the individual files.")
-parser.add_argument("--servicedoc", dest="sd", type=str,nargs=1, help="Url of the SWORDv2 service document (default: http://c4dm.eecs.qmul.ac.uk/smdmrd-test/swordv2/servicedocument")
+parser.add_argument("--servicedoc", dest="sd", type=str,nargs=1, help="Url of the SWORDv2 service document (default: use server.cfg if available, otherwise http://c4dm.eecs.qmul.ac.uk/rdr/swordv2/servicedocument")
 
 args = parser.parse_args()
 data = args.data[0]
 if args.zip:
 	storezip = True
 else:
 	storezip = False
 
 if args.sd == None:
-	sd = "http://c4dm.eecs.qmul.ac.uk/rdr/swordv2/servicedocument"
+	try:
+		f = open("server.cfg", "r")
+		sd = f.readline()
+		print "server.cfg: ", sd
+	except:
+		sd = "http://c4dm.eecs.qmul.ac.uk/rdr/swordv2/servicedocument"
 else:
 	sd = args.sd[0]
 
 
 try:

 				if entry is None:
 					entry = Entry(dcterms_title=(os.path.basename(data)))
 				creation_receipt = c.create(col_iri = collection.href, metadata_entry = entry, in_progress=True)
 				
 				# Add the files
+				# Get the longest common path in order to send the correct filename to keep the structure
+				common = os.path.commonprefix(fileslist)
 				for f in fileslist:
-					print "Uploading file ",os.path.basename(f)
+					filename = os.path.relpath(f,common)
+					print "Uploading file ", filename
 					payload = open(f,"rb")
 					deposit_receipt = c.add_file_to_resource(edit_media_iri = creation_receipt.edit_media,
 						payload = payload,
-						filename = os.path.basename(f),
+						filename = filename,
 						mimetype = 'application/zip',
 						packaging = 'http://purl.org/net/sword/package/Binary')
 					payload.close()
 			except HTTPResponseError:
 				print "Bad request"