Commit c6f9a031 authored by Cody Zacharias's avatar Cody Zacharias Committed by GitHub

Fix userlist / add Formatting option

parent 183865b9
...@@ -58,7 +58,7 @@ def check(args): ...@@ -58,7 +58,7 @@ def check(args):
def loadUserList(ul): def loadUserList(ul):
if os.path.exists(os.path.abspath(ul)): if os.path.exists(os.path.abspath(ul)):
userlist = open(os.path.abspath(ul), "r".read().splitlines()) userlist = open(os.path.abspath(ul), "r").read().splitlines()
else: else:
userlist = ul.split(",") userlist = ul.split(",")
un = "" un = ""
...@@ -96,6 +96,7 @@ def initialize(args): ...@@ -96,6 +96,7 @@ def initialize(args):
c.All = args.all c.All = args.all
#c.Debug = args.debug #c.Debug = args.debug
c.Essid = args.essid c.Essid = args.essid
c.Format = args.format
return c return c
def options(): def options():
...@@ -140,6 +141,7 @@ def options(): ...@@ -140,6 +141,7 @@ def options():
ap.add_argument("--essid", help="Elasticsearch Session ID, use this to differentiate scraping sessions.") ap.add_argument("--essid", help="Elasticsearch Session ID, use this to differentiate scraping sessions.")
ap.add_argument("--userlist", help="Userlist from list or file.") ap.add_argument("--userlist", help="Userlist from list or file.")
ap.add_argument("--retweets", help="Include user's Retweets (Warning: limited).", action="store_true") ap.add_argument("--retweets", help="Include user's Retweets (Warning: limited).", action="store_true")
ap.add_argument("--format", help="Custom output format")
args = ap.parse_args() args = ap.parse_args()
return args return args
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment