Dolda2000 GitWeb
/
automanga.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added getmanga ability to specify ad-hoc pattern on command-line.
[automanga.git]
/
manga
/
local.py
diff --git
a/manga/local.py
b/manga/local.py
index
3051013
..
7e21a9b
100644
(file)
--- a/
manga/local.py
+++ b/
manga/local.py
@@
-1,5
+1,5
@@
import os
import os
-import lib
+
from .
import lib
pj = os.path.join
def decode1(nm):
pj = os.path.join
def decode1(nm):
@@
-95,9
+95,9
@@
class manga(lib.manga):
self.stack = []
if os.path.exists(pj(self.path, "name")):
with open(pj(self.path, "name")) as s:
self.stack = []
if os.path.exists(pj(self.path, "name")):
with open(pj(self.path, "name")) as s:
- self.name = s.readline().strip()
.decode("utf-8")
+ self.name = s.readline().strip()
else:
else:
- self.name = os.path.basename(path)
.decode("utf-8")
+ self.name = os.path.basename(path)
self.direct = self.destruct()
def __len__(self):
self.direct = self.destruct()
def __len__(self):
@@
-128,6
+128,8
@@
class manga(lib.manga):
ordered, files = self.imglist()
pages, orig = self.bakenames(files)
mx = maxstruct(pages)
ordered, files = self.imglist()
pages, orig = self.bakenames(files)
mx = maxstruct(pages)
+ if mx is None:
+ raise TypeError("could not figure out any structure")
var = [i for i, part in enumerate(mx) if part == int]
structs = [(nm, decode1(nm)) for nm in pages]
if not ordered:
var = [i for i, part in enumerate(mx) if part == int]
structs = [(nm, decode1(nm)) for nm in pages]
if not ordered:
@@
-183,8
+185,13
@@
class directory(dumb):
ret.append(manga(pj(self.path, dent)))
return ret
ret.append(manga(pj(self.path, dent)))
return ret
+ def search(self, expr):
+ expr = expr.lower()
+ return [manga(pj(self.path, dent)) for dent in os.listdir(self.path) if expr in dent.lower()]
+
def __iter__(self):
for dent in os.listdir(self.path):
yield manga(pj(self.path, dent))
def __iter__(self):
for dent in os.listdir(self.path):
yield manga(pj(self.path, dent))
+
library = dumb
library = dumb