Merge branch 'master' into dev

Author: davidsulpy

.gitignore

@@ -53,6 +53,7 @@ docs/_build/
 # PyBuilder
 target/
 
+.DS_Store
 
 # example app private files 
 isstreamer.ini

ISStreamer/Streamer.py

@@ -86,7 +86,7 @@ def __init__(self, bucket_name="", bucket_key="", access_key="", ini_file_locati
         self.console_message("stream_api_base: {api}".format(api=self.StreamApiBase))
 
 
-    def set_bucket(self, bucket_name, bucket_key, retries=3):
+    def set_bucket(self, bucket_name="", bucket_key="", retries=3):
 
         def __create_bucket(new_bucket_name, new_bucket_key, access_key):
             api_base = self.StreamApiBase

example_app/example_read_csv.py

@@ -1,17 +1,23 @@
+#########
+# Use: python ./example_read_csv.py -b your_bucket_key -k your_access_key -f 'csv_file_location.csv'
+# Note: The CSV file structure should NOT contain a header and should be in the following format
+#       <ISO-8601 Date Time>,<StreamKey>,<StreamValue>/n
+##########
+
 import getopt, sys, time, csv
 from ISStreamer.Streamer import Streamer
 
 def read_args(argv):
 	try:
-		opts, args = getopt.getopt(argv,"hb:k:f:",["bucket_name=", "access_key=", "file_location="])
+		opts, args = getopt.getopt(argv,"hb:k:f:",["bucket_key=", "access_key=", "file_location="])
 	except getopt.GetoptError:
-		print('example_read_csv.py -b <bucket_name> -k <access_key> -f <file_location>')
+		print('example_read_csv.py -b <bucket_key> -k <access_key> -f <file_location>')
 		sys.exit(1)
 
 	for opt, arg in opts:
 		if opt == '-h':
-			print('example_read_csv.py -b <bucket_name> -k <access_key> -f <file_location>')
-		elif opt in ("-b", "--bucket_name"):
+			print('example_read_csv.py -b <bucket_key> -k <access_key> -f <file_location>')
+		elif opt in ("-b", "--bucket_key"):
 			bucket = arg
 		elif opt in ("-k", "--access_key"):
 			access_key = arg
@@ -20,17 +26,26 @@ def read_args(argv):
 
 	return bucket, access_key, file_location
 
+def is_float(str):
+	try:
+		float(str)
+		return True
+	except ValueError:
+		return False
 
 if __name__ == "__main__":
 	bucket, access_key, file_location = read_args(sys.argv[1:])
 
-	streamer = Streamer(bucket_name=bucket, access_key=access_key, buffer_size=20, offline=False)
+	streamer = Streamer(bucket_name=bucket, bucket_key=bucket, access_key=access_key, buffer_size=20, offline=False)
 
 	with open(file_location, 'rb') as csvfile:
 		reader = csv.reader(csvfile)
 		counter = 0
 		for row in reader:
-			streamer.log(row[1], row[2], epoch=row[0])
+			epoch = row[0]
+			if not is_float(epoch):
+				epoch = ((dateutil.parser.parse(epoch))-(dateutil.parser.parse("1970-01-01T00:00:00Z"))).total_seconds()
+			streamer.log(row[1], row[2], epoch=epoch)
 			counter += 1
 
 			if counter%10==0:

example_app/test_wifi.py

@@ -0,0 +1,15 @@
+import time
+from ISStreamer.Streamer import Streamer
+
+streamer = Streamer(bucket_name="Testing Wifi", ini_file_location="./isstreamer.ini")
+
+try:
+        for num in range(1, 1000):
+                streamer.log("num", num)
+                print("iteration #{}".format(num))
+                time.sleep(1)
+                streamer.flush()
+except Exception as ex:
+        print(ex)
+
+streamer.close()

install_scripts/python

@@ -1,6 +1,23 @@
 #!/bin/bash
 
 echo "Beginning ISStreamer Python Easy Installation!"
+echo "                                  _________       "
+echo "                               NN           NN    "
+echo "                             N                 N  "
+echo "                            N      NNNNNNN      N "
+echo "                          N      NN       N      N"
+echo "NNNNNNN                  N      N          N     N"
+echo "N     N                 N      N           N     N"
+echo "N     N               N       N            N     N"
+echo "                                                  "
+echo "NNNN NN            NNNNNNNN                NNNNNNN"
+echo "N     N           N      N                 N     N"
+echo "N     N          N      N                  N     N"
+echo "N      N       NN      N                   NNNNNNN"
+echo " N      NNNNNNN      N                            "
+echo "  N                 N                             "
+echo "    NN           NN                               "
+echo "       ---------                                  "
 echo "This may take a couple minutes to install, grab some coffee :)"
 echo "But don't forget to come back, I'll have questions later!"
 echo ""