Merge pull request hephaest0s#70 from rsrdesarrollo/master

bad JSON syntax, and multi-usb not implemented

Author: hephaest0s

.gitignore

@@ -52,3 +52,5 @@ docs/_build/
 
 # PyBuilder
 target/
+
+.idea

install/usbkill.ini

@@ -46,7 +46,7 @@
 # Be warned! Other parties can copy your trusted usbid to another usb device!
 # use whitelist command and single space separation as follows:
 # whitelist = ["4c2a:d2b0", "0b2d:a2c4"]
-# To allow multiple (2 and 4) USBs with same id: [ ("4c2a:d2b0":2), ("0b2d:a2c4":4)] or
+# To allow multiple (2 and 4) USBs with same id: [ {"4c2a:d2b0":2}, {"0b2d:a2c4":4}] or
 # [ "4c2a:d2b0","4c2a:d2b0", "0b2d:a2c4", ..., "0b2d:a2c4" ] (be consistent)
 whitelist = []
 

setup.py

@@ -40,7 +40,7 @@
       license='GPLv3',
       url='https://github.com/hephaest0s/usbkill',
 
-      packages=[name('usbkill')],
+      packages=['usbkill'],
       scripts=[name('install/usbkill')],
       data_files=[ ('/etc/', [ name('install/usbkill.ini') ]) ]
      )

usbkill/usbkill.py

@@ -68,7 +68,9 @@ class DeviceCountSet(dict):
 	def __init__(self, list):
 		count = dict()
 		for i in list:
-			if i in count:
+			if type(i) == dict:
+				count[i.keys()[0]] = i.values()[0]
+			elif i in count:
 				count[i] += 1
 			else:
 				count[i] = 1
@@ -386,8 +388,8 @@ def startup_checks():
 	# On first time use copy usbkill.ini to /etc/usebkill.ini
 	# If dev-mode, always copy and don't remove old settings
 	if not os.path.isfile(SETTINGS_FILE) or copy_settings:
-		sources_path = os.path.dirname(os.path.realpath(__file__)) + '/'
-		if not os.path.isfile(sources_path + "install/usbkill.ini"):
+		sources_path = os.path.dirname(os.path.realpath(__file__))
+		if not os.path.isfile(os.path.join(sources_path, "install/usbkill.ini")):
 			sys.exit("\n[ERROR] You have lost your settings file. Get a new copy of the usbkill.ini and place it in /etc/ or in " + sources_path + "/\n")
 		print("[NOTICE] Copying install/setting.ini to " + SETTINGS_FILE )
 		os.system("cp " + sources_path + "install/usbkill.ini " + SETTINGS_FILE)