Merge pull request #42 from wimglenn/cookies-os

v0.9.4

Author: wimglenn

aocd/cookies.py

@@ -85,22 +85,38 @@ def scrape_session_tokens():
     try:
         import browser_cookie3 as bc3  # soft dependency
     except ImportError:
-        sys.exit("To use this feature you must install browser-cookie3")
+        sys.exit("To use this feature you must pip install browser-cookie3")
 
     log.info("checking browser cookies storage for auth tokens, this might pop up an auth dialog!")
     log.info("checking chrome cookie jar...")
-    cookie_jar_chrome = bc3.chrome(domain_name=".adventofcode.com")
-    chrome = [c for c in cookie_jar_chrome if c.name == "session"]
-    log.info("%d candidates from chrome", len(chrome))
+    try:
+        chrome = bc3.chrome(domain_name=".adventofcode.com")
+        # TODO: check non-default profile for chrome/linux
+    except Exception as err:
+        log.debug("Couldn't scrape chrome - %s: %s", type(err), err)
+        chrome = []
+    else:
+        chrome = [c for c in chrome if c.name == "session"]
+        log.info("%d candidates from chrome", len(chrome))
 
     log.info("checking firefox cookie jar...")
-    cookie_jar_firefox = bc3.firefox(domain_name=".adventofcode.com")
-    firefox = [c for c in cookie_jar_firefox if c.name == "session"]
-    log.info("%d candidates from firefox", len(firefox))
+    try:
+        firefox = bc3.firefox(domain_name=".adventofcode.com")
+    except Exception as err:
+        log.debug("Couldn't scrape firefox - %s: %s", type(err), err)
+        firefox = []
+    else:
+        firefox = [c for c in firefox if c.name == "session"]
+        log.info("%d candidates from firefox", len(firefox))
+
+    # order preserving de-dupe
+    tokens = list({}.fromkeys([c.value for c in chrome + firefox]))
+    removed = len(chrome + firefox) - len(tokens)
+    if removed:
+        log.info("Removed %d duplicate%s", removed, "s"[:removed-1])
 
     working = {}  # map of {token: auth source}
-    for cookie in chrome + firefox:
-        token = cookie.value
+    for token in tokens:
         owner = get_owner(token)
         if owner is not None:
             working[token] = owner

aocd/get.py

@@ -106,24 +106,22 @@ def get_day_and_year():
             "/IPython/" in name,  # IPython adds a tonne of stack frames
             name.startswith("<"),  # crap like <decorator-gen-57>
             name.endswith("ython3"),  # ipython3 alias
+            basename.startswith("pydev_ipython_console"),  # PyCharm Python Console
         ]
         if not any(reasons_to_skip_frame):
+            log.debug("stack crawl found %s", name)
             abspath = os.path.abspath(name)
             break
         log.debug("skipping frame %s", name)
     else:
         import __main__
-
-        try:
-            __main__.__file__
-        except AttributeError:
+        if getattr(__main__, "__file__", "<input>") == "<input>":
             log.debug("running within REPL")
             day = current_day()
             year = most_recent_year()
             return day, year
-        else:
-            log.debug("non-interactive")
-            raise AocdError("Failed introspection of filename")
+        log.debug("non-interactive")
+        raise AocdError("Failed introspection of filename")
     years = {int(year) for year in re.findall(pattern_year, abspath)}
     if len(years) > 1:
         raise AocdError("Failed introspection of year")

aocd/version.py

@@ -1 +1 @@
-__version__ = "0.9.3"
+__version__ = "0.9.4"

setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name="advent-of-code-data",
-    version="0.9.3",
+    version="0.9.4",
     description="Get your puzzle data with a single import",
     long_description=open("README.rst").read(),
     long_description_content_type="text/x-rst",