From 5d26a7d49f096daba44c4531bd58df75d71f1eb4 Mon Sep 17 00:00:00 2001
From: Mike <admin@mylocaltech.co>
Date: Thu, 26 Sep 2019 22:06:38 -0400
Subject: [PATCH] Implement directory recursion, and type filtering

---
 .gitignore                                    |   2 ++
 __pycache__/library.cpython-37.pyc            | Bin 1475 -> 1670 bytes
 library.py                                    |  21 ++++++++++--------
 tests/__pycache__/test_library.cpython-37.pyc | Bin 1033 -> 1026 bytes
 tests/test_library.py                         |   4 ++--
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4cf998c..58b6342 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 books/*
+data/shelf.json
+*.pyc
\ No newline at end of file
diff --git a/__pycache__/library.cpython-37.pyc b/__pycache__/library.cpython-37.pyc
index 928ec1c309d47b1b71c32f1bbb1dceb8bbbd9a74..583d9ee92f28df91018eb94753496ec8a79956c0 100644
GIT binary patch
literal 1670
zcmZux&2Aev5aw{Xf3lpWt{oRa(HLl2WG~jOC!+}J6uk*;12pL(DY0Hs_A1h@%%xCU
zl~3}u=qpIaz7nrJ^%ZjJ3?=_GC>I=(L(VMcn{W8-_I8J1`+fY!TNyI;H!W^jfRpFg
z+anZ;DHySQJwgtC&2x?;9|dEP3t(C-SRQ=ORG`E)Q)0pMP{B)<h5w)j*3ZC2$4xz`
zPD@(fwA=rDjT+6!H~NJ<P+SGqEEhT)Mgvenh1ZbBDpE0O6P2hG$5eIj4_huhE^IMs
zPN#bI#S2|FO1B3^tqxk-7@VFo&AWrD9yDfL*s7^Z*!-U3xQ+c7dpkpM%H~Wm3ziQ9
z1q=S?uUByS*otL1hZW#nG-u0rMW>QitUeOVrtdmt2#mgs9Y?!ISAbR>JiUddVa0*H
zLi~PYKe5;B7gqDv_tuJG6hYsCaqwH#b?KlQX*sG|>qIlrwTnuRoa;~|vOUwIffK{F
zsht=#g>q?m6TjPP%c7QpW~8*qx67$9y0(%Wwl4kdqSO;YzzH=SPh1!ERvSrf+l)KW
zl4ltF#mpy&#`|Zzvu3P&rqH9N?)_kzp)PIPn_Rx6EA&Ryi7CwG;pEaKQdV_krQ9MY
zAEICo!2{sXMM>Xm=Qc@)H-}3~05zl^i?I7doZ#f*jb%$9&|k2({VQ(SkS~KdDA;Fn
zzRy;06?mPP2g`7U1ob*G7p6aF!)O^J^vOI}p$EWpc@3_Bop&h_2srP*hhCOC-n1?z
zuvKN8m=yNR#l=bMCt=l+Hf*h_CWdb4qGEz6QHFSvh2~=%@@S2>*`WiWB-1>WRV&fh
zBe@p4xb5xsaME^BFn9>Nd=~`lz-;dhpnFNYC9A;WDRz(1&p5#d*@_|2V2LGzh;SQN
zG3Ue33gu&7AQcxx+t?;H9d;B^a~F}@T6PhW81eZJF*ih<MQ;xEWO`yKE!noevg1a(
zxNOD~q!QAO$QiBa<Dym<raW8Y6M8b47)?z=g6?eSr7<6&$b^RssfIkwh0&)M9<~o*
zA_{$uz4dPtB+!A!#G*%cAl)bLElR{F`mIOlIZiII2!~jlSgxO8xdN8!SL<>`{P+rY
z*5zmeI=28niUoX%$j<2jgFdGDDS9#wNYKSx&}wTaff-+i6HV*te5yZ)!tD`Yh0*Jp
zm78+>5)C)$=NK1N$1cpC+(q`kR{g9)WmXqsEv4&7Id0Sx-wEluQl3wX(Pk%>QZ=QN
zhFIoPkf;9LAX@rd`WVbJ+NLtUCp<#~)KStr^a*k^={!i2*pNPp)~VblyC)=kjtO<Y
af6te9O%7dhw7%*$bZp}_!IX9(3jPJdeubF;

delta 793
zcmZuv-EPw`6!vi(CrxSC%CuFL01c!;E-00_?ZpI$E3^x^m{c)JJ7-<mkz|f521>Py
zA}$b8Rrv+lXBck)PmyaLgyS&KK-l_@9sB%z{!TvCzE%ClwVFq89Oj=79<hc0&ZGFX
zi^$rG`Bp<PVSglDTX5mv%7rT`xH^mP&tE9?QbfUs3YgLP>nXf%Dr?DdSV2yDc21Uj
zMR4crleoi(a>t$&K+L?1qZqe21&peox2KPxy;dz)l7?}?50m&P8g}&sjA32hrXAbI
zibN0SopUfd92SBho*=UOXoh48XSWntf}$g91y9L=KczV!ExH0Ar}cf3!%GstUSJnA
z$qMHr%9MztbTGVI86?TLm-f|h!TTxl5P>DHmp4bzN!T;aa_t@-$n`&_Zgy2P8;HzB
zLx4dYd_A|edw+3k;~hSgtdOUInUR7nErF6vsbb2`>4@hj=gdgx<YeR^SGxCsziNf)
zWDvMzox&T)us=?dC|0_~?(P=0;hkM_Em(HgkGo8U!?S;B8V#F>tn53uz`=vM{>mQ0
zGyQ`-=$4!qRwgr0X0>O~K(@bC<MJkk%WKA%WO55lVP&C`CS^cNxe7jsqti)vwY+{~
zH#fG?Co3BX6f65Ux&C7BfU7U;*7*&S(Mb6#xADG`qLjQ;+lX30l+SQcZMWib*OBHt
g;L`L!nr_I3F{ZWB{MqIG{}L8%=WQY;I^~-`0Wlz$*#H0l

diff --git a/library.py b/library.py
index ae0520c..d65cf6f 100755
--- a/library.py
+++ b/library.py
@@ -9,6 +9,7 @@ config = Config()
 class Catalogue:
     """Decodes and stores book information"""
     def __init__(self):
+        self.file_list = []
         with open(config.book_shelf, 'r') as f:
             try:
                 self.catalogue = json.load(f)
@@ -17,24 +18,26 @@ class Catalogue:
                 with open(config.book_shelf, 'w') as f:
                     json.dump(self.filter_books(), f)
 
-    def scan_folder(self):
-        file_list = []
-        for f in os.listdir(config.book_path):
-            file_list.append(f)
-        return file_list
+    def scan_folder(self, folder=config.book_path):
+        for f in os.listdir(folder):
+            _path = os.path.abspath(folder+'/'+f)
+            #_path = os.path.abspath('.')+'/'+folder+f+'/'
+            _is_dir = os.path.isdir(_path.strip()+'/')
+            if _is_dir:
+                self.file_list.append(self.scan_folder(_path))
+            self.file_list.append(_path)
 
     def filter_books(self):
         scan = self.scan_folder()
-        breakpoint()
         regx = re.compile(r"\.epub")
-        self.books = list(filter(regx.search, scan))
-        return self.books
+        self.books = list(filter(regx.search, filter(None, self.file_list)))
+        with open(config.book_shelf, 'w') as f:
+                json.dump(self.books, f)
 
     def compare_shelf_current(self):
         try:
             self.books
         except Exception:
             self.filter_books()
-        breakpoint()
         unique = set(self.books) - set(self.catalogue)
         return unique
diff --git a/tests/__pycache__/test_library.cpython-37.pyc b/tests/__pycache__/test_library.cpython-37.pyc
index d9d8f8e6e588fde74de5a712f0a76f8daf10bf1b..9babb429099fa3ddb478782d35e8626364d84288 100644
GIT binary patch
delta 164
zcmeC=XyV{?;^pOH0D|!3-q_O{d8aa(iU4^v3=0@a7@HXuFfC+Q$jHc$!Vt`$$>^ua
zT*LyDEn)%^Q9NmxIVGt@@k#ml*~OFJGKw=QPv&J7mqZo@8C?ug&A?ctJ(-nR9#vBu
llj-Dxj1rUQF`Z!J1S%@xo}9yM!+2}*N@jINp2-)PEdY{;DhdDq

delta 153
zcmZqT=;Yva;^pOH0D`)zuGmW(d8aZ?PGAz`V_wL_$dJMi%%I8Wr^zz8o=HNOyEr*9
zFFq|lCndG$7F&K&R%-I(HB1tWN|WC+ic26#f{ZI>0-4EJr8QZeNgi3}WG^OD)*?=z
g<m8D==h(P`j3S=NsmwNvQIi)jt26RWKE-SS00?m?HUIzs

diff --git a/tests/test_library.py b/tests/test_library.py
index 3b4a59b..c51683c 100755
--- a/tests/test_library.py
+++ b/tests/test_library.py
@@ -7,8 +7,8 @@ class Testing(unittest.TestCase):
     def test_libray_catalogue(self):
         self.assertIsNotNone(Catalogue())
 
-    def test_library_catalogue_scan_folder(self):
-        self.assertIsInstance(Catalogue().scan_folder(), object)
+    def test_library_catalogue_filter_books(self):
+        self.assertIsNotNone(Catalogue().filter_books())
 
     def test_library_catalogue_compare_shelf_current(self):
         self.assertIsInstance(Catalogue().compare_shelf_current(), Catalogue)