From 69313de81152ee5f20d0a1078cc6b2b6d83a31bb Mon Sep 17 00:00:00 2001
From: Wesley Kerfoot <wjak56@gmail.com>
Date: Sat, 1 Jun 2019 17:12:01 -0400
Subject: [PATCH] Refactor settings

---
 deletefb/config.py       |  3 +++
 deletefb/deletefb.py     | 17 ++++++++---------
 deletefb/tools/common.py |  7 +++++--
 3 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 deletefb/config.py

diff --git a/deletefb/config.py b/deletefb/config.py
new file mode 100644
index 0000000..16fb42a
--- /dev/null
+++ b/deletefb/config.py
@@ -0,0 +1,3 @@
+settings = {
+    "ARCHIVE" : False
+}
diff --git a/deletefb/deletefb.py b/deletefb/deletefb.py
index 54d0c66..c69d42b 100755
--- a/deletefb/deletefb.py
+++ b/deletefb/deletefb.py
@@ -6,6 +6,7 @@ import json
 import os
 import sys
 
+from config import settings
 from tools.common import logger
 from tools.login import login
 from tools.wall import delete_posts
@@ -13,7 +14,6 @@ from tools.likes import unlike_pages
 
 LOG = logger("deletefb")
 
-
 def run_delete():
     parser = argparse.ArgumentParser()
 
@@ -92,11 +92,7 @@ def run_delete():
 
     args = parser.parse_args()
 
-    if args.archive_off:
-        os.environ["DELETEFB_ARCHIVE"] = "false"
-    else:
-        os.environ["DELETEFB_ARCHIVE"] = "true"
-
+    settings["ARCHIVE"] = not args.archive_off
 
     if args.year and args.mode != "wall":
         parser.error("The --year option is only supported in wall mode")
@@ -111,9 +107,12 @@ def run_delete():
     )
 
     if args.mode == "wall":
-        delete_posts(driver,
-                     args.profile_url,
-                     year=args.year)
+        delete_posts(
+            driver,
+            args.profile_url,
+            year=args.year
+        )
+
     elif args.mode == "unlike_pages":
         unlike_pages(driver)
     else:
diff --git a/deletefb/tools/common.py b/deletefb/tools/common.py
index fe97881..e9b99af 100644
--- a/deletefb/tools/common.py
+++ b/deletefb/tools/common.py
@@ -2,9 +2,11 @@ import json
 import logging
 import logging.config
 import os
-from os.path import abspath, relpath, split, isfile
 import time
 
+from config import settings
+
+from os.path import abspath, relpath, split, isfile
 from selenium.common.exceptions import (
     NoSuchElementException,
     StaleElementReferenceException,
@@ -57,8 +59,9 @@ def archiver(category):
     log_file = open(log_path, mode="ta", buffering=1)
 
     def log(content, timestamp=False):
-        if os.environ.get("DELETEFB_ARCHIVE", "true") == "false":
+        if not settings["ARCHIVE"]:
             return
+
         structured_content = {
             "category" : category,
             "content" : content,