Allow for specification of a folder using it's UUID and updated Readme to include new commands

README.md

@@ -15,6 +15,18 @@ Success uploaded: /home/xuxe/test/subdir/Glowworm+-+Periphescence.mp3 </br>
 Success uploaded: /home/xuxe/test/subdir/Death+Grips+-+Come+Up+and+Get+Me.mp3 </br>
 Completed -> Uploaded 3 files with 0 errors. </br>
 
+# Specify Folder:
+You need the folder UUID to specify a folder.
+To get this, when viewing a folder i.e. http://127.0.0.1:8087/play/list/6167f60e-acd0-4e84-b5c0-d2e102d951c3, the 6167f60e-acd0-4e84-b5c0-d2e102d951c3 on the end would be the UUID
+Examples:
+- **Basic ->** ./sinusbot_uploader.py 127.0.0.1 8087 admin foober /myfolder 6167f60e-acd0-4e84-b5c0-d2e102d951c3
+- **Recursive ->** ./sinusbot_uploader.py 127.0.0.1 8087 admin foobar /myfolder 6167f60e-acd0-4e84-b5c0-d2e102d951c3 -R
+- **Recursive + SSL ->** ./sinusbot_uploader.py 127.0.0.1 8087 admin foobar /myfolder 6167f60e-acd0-4e84-b5c0-d2e102d951c3 -R SSL
+- **SSL ->** ./sinusbot_uploader.py 127.0.0.1 8087 admin foobar /myfolder 6167f60e-acd0-4e84-b5c0-d2e102d951c3 SSL
+- **SSL + Recursive ->** ./sinusbot_uploader.py 127.0.0.1 8087 admin foobar /myfolder 6167f60e-acd0-4e84-b5c0-d2e102d951c3 SSL -R
+
+**You can still use the original way specified in the Usage**
+
 
 
 SUPPORTED FILE TYPES: extensions=['mp3', 'mp4', 'wav', '3gp'] - i have added at the moment only mp3, mp4, wav and 3gp. If you need others you can add your own or report it and i will add it! 

sinusbot_uploader.py

@@ -6,172 +6,184 @@
 import httplib
 import os.path
 
+
 class Sinusbot:
-	jwt_token = '' 		#Auth Token
-	botId = ''			#Bot ID required for the Login
-	url = ''			#Base URL 
-	port = 8087 		#default Sinusbot Port
-	ssl = False #		Disable SSL by default
-	username = ''
-	password = ''
-	success_count = 0
-	error_count = 0
-	extensions=['mp3', 'mp4', 'wav', '3gp']
-
-	def __init__(self, url, port, username, password, ssl):
-		self.url = url
-		self.port = port
-		self.ssl = ssl
-		self.username = username
-		self.password = password
-		self.botId = self.DefaultId()
-		self.success_count = 0
-		self.error_count = 0
-
-
-	def DefaultId(self):		
-
-		if self.ssl: 
-			conn = httplib.HTTPSConnection(self.url, self.port)
-
-		else:
-			conn = httplib.HTTPConnection(self.url, self.port)
-
-		conn.request("GET", "/api/v1/botId")
-		response = conn.getresponse()
-
-		if response.status == 200:
-			j = json.loads(response.read())
-			conn.close()
-			return j['defaultBotId']
-
-
-		else:
-			conn.close()
-			return ''
-
-
-
-	def Auth(self):
-
-		if self.ssl: 
-			conn = httplib.HTTPSConnection(self.url, self.port)
-
-		else:
-			conn = httplib.HTTPConnection(self.url, self.port)
-
-		data =  {"username":self.username, "password":self.password, "botId": str(self.botId)}  #Parse the botId with str() to pre event a golang error in case of unicode
-		hdr = {"Content-type": "application/json"}
-
-		conn.request("POST", "/api/v1/bot/login", json.dumps(data), hdr)
-		response = conn.getresponse()
-
-		if response.status == 200:
-			response = str(response.read())
-			j = json.loads(response)
-
-			try:
-					self.jwt_token = j['token']
-					conn.close()
-					self.username = ''
-					self.password = '' 
-					return True
-
-
-			except:	
-					conn.close()
-					print 'Could not get token: %s' % (response)
-					return False
-
-
-		else:
-			conn.close()
-			return False
-
-	def Upload(self, LocalPath):
-
-		if not os.path.isfile(LocalPath):
-			return False
-
-
-		try:
-			f = open(LocalPath, 'r')
-			bytes = f.read()
-			f.close()
-		except: 
-			print 'Could not read -> ' + LocalPath
-			return False
-
-		if self.ssl: 
-			conn = httplib.HTTPSConnection(self.url, self.port)
-
-		else:
-			conn = httplib.HTTPConnection(self.url, self.port)
-
-		hdr = {"Content-type": "application/json", "Authorization": "bearer " + str(self.jwt_token), "Content-Length": len(bytes)}
-
-		conn.request("POST", "/api/v1/bot/upload", bytes, hdr)
-		response = conn.getresponse()
-
-
-		if response.status == 200:
-			conn.close()
-			self.success_count += 1
-			return True
-		else:
-			conn.close()
-			self.error_count += 1
-			return False
-
+    jwt_token = ''  # Auth Token
+    botId = ''  # Bot ID required for the Login
+    url = ''  # Base URL
+    port = 8087  # default Sinusbot Port
+    ssl = False  # Disable SSL by default
+    username = ''
+    password = ''
+    success_count = 0
+    error_count = 0
+    extensions = ['mp3', 'mp4', 'wav', '3gp']
+
+    def __init__(self, url, port, username, password, folder, ssl):
+        self.url = url
+        self.port = port
+        self.ssl = ssl
+        self.folder = folder
+        self.username = username
+        self.password = password
+        self.botId = self.DefaultId()
+        self.success_count = 0
+        self.error_count = 0
+
+    def DefaultId(self):
+
+        if self.ssl:
+            conn = httplib.HTTPSConnection(self.url, self.port)
+
+        else:
+            conn = httplib.HTTPConnection(self.url, self.port)
+
+        conn.request("GET", "/api/v1/botId")
+        response = conn.getresponse()
+
+        if response.status == 200:
+            j = json.loads(response.read())
+            conn.close()
+            return j['defaultBotId']
+
+
+        else:
+            conn.close()
+            return ''
+
+    def Auth(self):
+
+        if self.ssl:
+            conn = httplib.HTTPSConnection(self.url, self.port)
+
+        else:
+            conn = httplib.HTTPConnection(self.url, self.port)
+
+        data = {"username": self.username, "password": self.password,
+                "botId": str(self.botId)}  # Parse the botId with str() to pre event a golang error in case of unicode
+        hdr = {"Content-type": "application/json"}
+
+        conn.request("POST", "/api/v1/bot/login", json.dumps(data), hdr)
+        response = conn.getresponse()
+
+        if response.status == 200:
+            response = str(response.read())
+            j = json.loads(response)
+
+            try:
+                self.jwt_token = j['token']
+                conn.close()
+                self.username = ''
+                self.password = ''
+                return True
+
+
+            except:
+                conn.close()
+                print('Could not get token: %s' % (response))
+                return False
+
+
+        else:
+            conn.close()
+            return False
+
+    def Upload(self, LocalPath):
+
+        if not os.path.isfile(LocalPath):
+            return False
+
+        try:
+            f = open(LocalPath, 'r')
+            bytes = f.read()
+            f.close()
+        except:
+            print('Could not read -> ' + LocalPath)
+            return False
+        if self.ssl:
+            conn = httplib.HTTPSConnection(self.url, self.port)
+
+        else:
+            conn = httplib.HTTPConnection(self.url, self.port)
+
+        hdr = {"Content-type": "application/json", "Authorization": "bearer " + str(self.jwt_token),
+               "Content-Length": len(bytes)}
+        url = "/api/v1/bot/upload"
+        if self.folder is not False:
+            url = url + "?folder=" + self.folder
+        conn.request("POST", url, bytes, hdr)
+        response = conn.getresponse()
+
+        if response.status == 200:
+            conn.close()
+            self.success_count += 1
+            return True
+        else:
+            conn.close()
+            self.error_count += 1
+            return False
+
 
 def uploadHelper(directory, bot, recurse):
-	truePath = os.path.abspath(directory)
-	contents = os.listdir(truePath)
-
-	for entry in contents:
-		entryTruePath = os.path.join(truePath, entry)
-		if os.path.isfile(entryTruePath):
-			fileExtension = entryTruePath.split('.')[-1]
-			if (fileExtension in bot.extensions):
-				if bot.Upload(entryTruePath):
-					print 'Success uploaded: ' + entryTruePath
-				else:
-					print 'Error while uploading: ' + entryTruePath
-			else:
-				print 'File type not supported: ' + entryTruePath
-		elif os.path.isdir(entryTruePath) and recurse:
-			uploadHelper(entryTruePath, bot, recurse)
-		
-		
+    truePath = os.path.abspath(directory)
+    contents = os.listdir(truePath)
+
+    for entry in contents:
+        entryTruePath = os.path.join(truePath, entry)
+        if os.path.isfile(entryTruePath):
+            fileExtension = entryTruePath.split('.')[-1]
+            if (fileExtension in bot.extensions):
+                if bot.Upload(entryTruePath):
+                    print('Success uploaded: ' + entryTruePath)
+                else:
+                    print('Error while uploading: ' + entryTruePath)
+            else:
+                print('File type not supported: ' + entryTruePath)
+        elif os.path.isdir(entryTruePath) and recurse:
+            uploadHelper(entryTruePath, bot, recurse)
+
+
 if len(sys.argv) < 6:
-	print 'Usage: ./sinusbot_uploader.py 123.124.125.1 port username password LOCAL_DIRECTORY SSL(optional) -R (Recursive)'
-	sys.exit(1)
+    print('Usage: ./sinusbot_uploader.py 123.124.125.1 port username password LOCAL_DIRECTORY SSL(optional) -R (Recursive)')
+    sys.exit(1)
 else:
-	recursive = False
-	if len(sys.argv) >= 7:
-		if sys.argv[6] == 'SSL':
-			bot = Sinusbot(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], True)
-		if sys.argv[6] == '-R' or sys.argv[7] == '-R':
-			recursive = True
-	else:
-			bot = Sinusbot(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], False)
-
-
-	if not os.path.isdir(sys.argv[5]):
-		print 'LOCAL_DIRECTORY must be a valid directory!'
-		sys.exit(1)
-
-	bot = Sinusbot(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], False)
-	if bot.Auth():
-		print 'Success Authenticated!'
-
-		dir = os.path.abspath(sys.argv[5])
-		files = os.listdir(dir)
-
-		uploadHelper(dir, bot, recursive)					
-
-		print 'Completed -> Uploaded %d files with %d errors.' % (bot.success_count, bot.error_count)
-
-	else:
-		print 'Error on Authentication!'
-		sys.exit(1)
+    recursive = False
+    folder = False
+    SSL = False
+    if len(sys.argv) >= 7:
+        if sys.argv[6] == 'SSL':
+            SSL = True
+        if sys.argv[6] == '-R':
+            recursive = True
+        if sys.argv[6] != '-R' and sys.argv[6] != 'SSL' and sys.argv[6] is not None:
+            folder = sys.argv[6]
+    if len(sys.argv) >= 8:
+        if sys.argv[6] == 'SSL' or sys.argv[7] == 'SSL':
+            SSL = True
+        if sys.argv[6] == '-R' or sys.argv[7] == '-R':
+            recursive = True
+    else:
+        bot = Sinusbot(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], False, False)
+    if len(sys.argv) == 9:
+        if sys.argv[8] == 'SSL':
+            SSL = True
+        if sys.argv[8] == '-R':
+            recursive = True
+    if not os.path.isdir(sys.argv[5]):
+        print('LOCAL_DIRECTORY must be a valid directory!')
+        sys.exit(1)
+
+    bot = Sinusbot(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], folder, SSL)
+    if bot.Auth():
+        print('Success Authenticated!')
+
+        dir = os.path.abspath(sys.argv[5])
+        files = os.listdir(dir)
+
+        uploadHelper(dir, bot, recursive)
+
+        print('Completed -> Uploaded %d files with %d errors.' % (bot.success_count, bot.error_count))
+
+    else:
+        print('Error on Authentication!')
+        sys.exit(1)