From: Fredrik Tolf Date: Sat, 11 May 2013 13:41:55 +0000 (+0200) Subject: Added names to pages as well. X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=699d0c171c7482ce6c6a2835df7e0ba7b7505729;p=automanga.git Added names to pages as well. --- diff --git a/manga/lib.py b/manga/lib.py index a3fa9a6..ffea7a3 100644 --- a/manga/lib.py +++ b/manga/lib.py @@ -36,7 +36,11 @@ class pagetree(object): `id', which should be a string that can be passed to the `byid' function of its parent node to recover the node. Such string ID should be more persistent than the node's numeric index in the - parent.""" + parent. + + All pagetree objects should contain an attribute `name', + containing some human-readable Unicode representation of the + pagelist.""" def idlist(self): """Returns a list of the IDs necessary to resolve this node @@ -52,10 +56,7 @@ class pagetree(object): class pagelist(pagetree): """Class representing a list of either pages, or nested - pagelists. Might be, for instance, a volume or a chapter. - - All pagelists should contain an attribute `name', containing some - human-readable Unicode representation of the pagelist.""" + pagelists. Might be, for instance, a volume or a chapter.""" def __len__(self): """Return the number of (direct) sub-nodes in this pagelist. diff --git a/manga/mangafox.py b/manga/mangafox.py index 572853c..110be99 100644 --- a/manga/mangafox.py +++ b/manga/mangafox.py @@ -29,6 +29,7 @@ class page(lib.page): self.manga = self.volume.manga self.n = n self.id = str(n) + self.name = u"Page %s" % n self.url = url self.ciurl = None @@ -41,6 +42,12 @@ class page(lib.page): def open(self): return imgstream(self.iurl()) + def __str__(self): + return self.name + + def __repr__(self): + return "" % (self.manga.name, self.volume.name, self.chapter.name, self.name) + class chapter(lib.pagelist): def __init__(self, volume, stack, id, name, url): self.stack = stack