Add option --verbose
This commit is contained in:
parent
c49d6847f3
commit
e51294bca2
|
@ -32,7 +32,7 @@ def add_message(msg):
|
||||||
msg.get_payload(decode=True)
|
msg.get_payload(decode=True)
|
||||||
.decode(charset, errors='replace'))
|
.decode(charset, errors='replace'))
|
||||||
|
|
||||||
def extract_features(msgid):
|
def extract_features(msgid, verbose):
|
||||||
db = psycopg2.connect("dbname=bayes")
|
db = psycopg2.connect("dbname=bayes")
|
||||||
csr = db.cursor(cursor_factory=ppe.DictCursor)
|
csr = db.cursor(cursor_factory=ppe.DictCursor)
|
||||||
csr.execute(
|
csr.execute(
|
||||||
|
@ -89,7 +89,8 @@ def extract_features(msgid):
|
||||||
p1 = 1
|
p1 = 1
|
||||||
p2 = 1
|
p2 = 1
|
||||||
for i in interesting_evidence:
|
for i in interesting_evidence:
|
||||||
print("#", i["spam_prob"], i["type"], i["length"], i["feature"], sep="\t")
|
if verbose:
|
||||||
|
print("#", i["spam_prob"], i["type"], i["length"], i["feature"], sep="\t")
|
||||||
csr.execute(
|
csr.execute(
|
||||||
"insert into used_evidence(message, spam_prob, type, length, feature) values(%s, %s, %s, %s, %s)",
|
"insert into used_evidence(message, spam_prob, type, length, feature) values(%s, %s, %s, %s, %s)",
|
||||||
(msg_pk, i["spam_prob"], i["type"], i["length"], i["feature"]))
|
(msg_pk, i["spam_prob"], i["type"], i["length"], i["feature"]))
|
||||||
|
@ -102,6 +103,7 @@ def extract_features(msgid):
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
ap = argparse.ArgumentParser()
|
ap = argparse.ArgumentParser()
|
||||||
|
ap.add_argument('--verbose', action='store_true')
|
||||||
ap.add_argument('file', nargs='?')
|
ap.add_argument('file', nargs='?')
|
||||||
args = ap.parse_args()
|
args = ap.parse_args()
|
||||||
if args.file:
|
if args.file:
|
||||||
|
@ -111,7 +113,7 @@ def main():
|
||||||
parser = email.parser.BytesParser(policy=email.policy.default)
|
parser = email.parser.BytesParser(policy=email.policy.default)
|
||||||
msg = parser.parse(fh)
|
msg = parser.parse(fh)
|
||||||
add_message(msg)
|
add_message(msg)
|
||||||
p = extract_features(msg["Message-Id"])
|
p = extract_features(msg["Message-Id"], args.verbose)
|
||||||
print(p, "spam" if p > 0.5 else "ham")
|
print(p, "spam" if p > 0.5 else "ham")
|
||||||
|
|
||||||
main()
|
main()
|
||||||
|
|
Loading…
Reference in New Issue