Fix pickle implementation

diff --git a/lightcards/deck.py b/lightcards/deck.py
index f5ad58310a223895a97f8570dbbc2e8b90acbdb0..110c5b4fdcee15ab50a27c5eca2ea52dfa3a0ee7 100644 (file)
--- a/lightcards/deck.py
+++ b/lightcards/deck.py
@@ -15,6 +15,9 @@ class Card:
         if len(inp) >= 2:
             self.back = inp[1]
 
+    def __str__(self):
+        return f"{self.front}, {self.back}"
+
     def unStar(self):
         self.starred = False
 

diff --git a/lightcards/display.py b/lightcards/display.py
index 133b7194d5d31a91f1ca36543077df66d87ad9fe..a130728e703776f8ee1d5b62ccad9454886da353 100644 (file)
--- a/lightcards/display.py
+++ b/lightcards/display.py
@@ -48,7 +48,7 @@ class Display:
         if self.obj.getIdx() + 1 == len(self.stack):
             self.obj.setIdx(0)
 
-        progress.dump(self.stack, runner.get_orig())
+        progress.dump(self.stack, runner.get_orig()[1])
         sys.exit(0)
 
     def ntotal(self):

diff --git a/lightcards/progress.py b/lightcards/progress.py
index 297895d2960735338ec580588d789c6285cdfc15..3be0247e42170c3243cf03814dc09b51b0ab38bc 100644 (file)
--- a/lightcards/progress.py
+++ b/lightcards/progress.py
@@ -6,15 +6,12 @@ import os
 import pickle
 import shutil
 
-global dired
 dired = f"{os.path.expanduser('~')}/.cache/lightcards/"
 
 
 def name_gen(stra):
     """Generate hash of stack for name of pickle file"""
-    hasher = hashlib.md5()
-    hasher.update(str(stra).encode("utf-8"))
-    return hasher.hexdigest()
+    return hashlib.md5(str([str(x) for x in stra]).encode("utf-8")).hexdigest()
 
 
 def make_dirs(dired):

diff --git a/lightcards/runner.py b/lightcards/runner.py
index 83a71b009b25413e51f112f2e200251b4b705a76..0d01ca16b8df467b0899e646d75d2485de6a001b 100644 (file)
--- a/lightcards/runner.py
+++ b/lightcards/runner.py
@@ -56,7 +56,7 @@ def show(args, stack, headers):
 
     # Check for caches
     idx = Status()
-    cache = progress.dive(get_orig())
+    cache = progress.dive(get_orig()[1])
     if cache:
         (stack) = cache