Преглед на файлове

Update gitignore, switch version, minor logging improvement

Cammy преди 7 години
родител
ревизия
6e4e3c98e5
променени са 5 файла, в които са добавени 11 реда и са изтрити 4 реда
  1. 2 0
      .gitignore
  2. 2 2
      cAuthCookie.py
  3. 1 1
      cDownloader.py
  4. 5 0
      cMain.py
  5. 1 1
      looper.sh

+ 2 - 0
.gitignore

@@ -5,3 +5,5 @@ credentials\.json
 setup\.py
 
 last_stream\.html
+
+looper\.sh

+ 2 - 2
cAuthCookie.py

@@ -40,8 +40,8 @@ def onlogin_callback(api, settings_file):
 
 
 def login(username, password):
-
-    cLogger.log('PYINSTALIVE DOWNLOADER (API v{0!s})'.format(client_version), "GREEN")
+    from cMain import scriptVersion
+    cLogger.log('PYINSTALIVE DOWNLOADER (Script v{0!s})'.format(scriptVersion), "GREEN")
     cLogger.seperator("GREEN")
 
     device_id = None

+ 1 - 1
cDownloader.py

@@ -100,7 +100,7 @@ def getUserInfo(record):
 		user_id = user_res['user']['pk']
 		getBroadcast(user_id)
 	except Exception as e:
-		cLogger.log('[E] Could not get user info: ' + str(e), "RED")
+		cLogger.log('[E] Could not get user info for "' + record + '" : ' + str(e), "RED")
 		cLogger.seperator("GREEN")
 		sys.exit(0)
 

+ 5 - 0
cMain.py

@@ -14,7 +14,12 @@ from socket import timeout
 from ssl import SSLError
 from urllib2 import URLError
 
+logging.disable(logging.CRITICAL)
+
 global api, args, seperator
+
+scriptVersion = "2.1.0"
+
 parser = argparse.ArgumentParser(description='Login')
 parser.add_argument('-u', '--username', dest='username', type=str, required=True)
 parser.add_argument('-p', '--password', dest='password', type=str, required=True)

+ 1 - 1
looper.sh

@@ -1,5 +1,5 @@
 while true
 do
-python cMain.py -u "naxunaw" -p "pyinstalive" -r "simplerealistic"
+python cMain.py -u "naxunaw" -p "pyinstalive" -r "milliebobbybrown"
 sleep 10
 done