diff --git a/scripts/galleroob b/scripts/galleroob old mode 100644 new mode 100755 diff --git a/weboob/applications/galleroob/galleroob.py b/weboob/applications/galleroob/galleroob.py index 52c120485a68efe59a7fe5b034e98690a9034501..fb3e6074a85d92d93f9d9a08cc35aa0332214b47 100644 --- a/weboob/applications/galleroob/galleroob.py +++ b/weboob/applications/galleroob/galleroob.py @@ -28,7 +28,7 @@ class Galleroob(ReplApplication): APPNAME = 'galleroob' - VERSION = '0.0' + VERSION = '0.8' COPYTIGHT = 'Copyright(C) 2011 NoƩ Rubinstein' DESCRIPTION = 'galleroob browses and downloads web image galleries' CAPS = ICapGallery diff --git a/weboob/backends/ehentai/backend.py b/weboob/backends/ehentai/backend.py index 99657781bc4b07b4b5fc1c4a378de9638f0beb37..ed9b8d86289344bcbed13608c05e5d24bb360991 100644 --- a/weboob/backends/ehentai/backend.py +++ b/weboob/backends/ehentai/backend.py @@ -19,13 +19,8 @@ from __future__ import with_statement -import datetime -import re -import urllib - from weboob.capabilities.gallery import ICapGallery from weboob.tools.backend import BaseBackend -from weboob.tools.misc import to_unicode from weboob.tools.value import Value, ValuesDict from .browser import EHentaiBrowser @@ -39,9 +34,9 @@ class EHentaiBackend(BaseBackend, ICapGallery): NAME = 'ehentai' MAINTAINER = 'Roger Philibert' EMAIL = 'roger.philibert@gmail.com' - VERSION = '0.7' + VERSION = '0.8' DESCRIPTION = 'E-hentai galleries' - LICENSE = 'GPLv3' + LICENSE = 'AGPLv3+' BROWSER = EHentaiBrowser CONFIG = ValuesDict( Value('domain', label='Domain', default='g.e-hentai.org'), diff --git a/weboob/backends/ehentai/pages.py b/weboob/backends/ehentai/pages.py index d3cda26a0bfc14f41bbecff38c1e3ac35eac6e1e..24768ae68cdded0c2fbcface6c2bc37cd4e6bfde 100644 --- a/weboob/backends/ehentai/pages.py +++ b/weboob/backends/ehentai/pages.py @@ -18,13 +18,12 @@ # along with weboob. If not, see . from weboob.tools.browser import BasePage -from weboob.tools.parsers.lxmlsoupparser import LxmlSoupParser from weboob.tools.misc import html2text from weboob.capabilities.gallery import Thumbnail from datetime import datetime import re -from .gallery import EHentaiGallery, EHentaiImage +from .gallery import EHentaiGallery __all__ = ['GalleryPage', 'ImagePage', 'IndexPage', 'HomePage', 'LoginPage'] diff --git a/weboob/capabilities/gallery.py b/weboob/capabilities/gallery.py index 639d6ff6f834193691a427c8d77de167898131cf..45c59c1fbf7193449e29f552de657bb9f48f81a7 100644 --- a/weboob/capabilities/gallery.py +++ b/weboob/capabilities/gallery.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from datetime import datetime, timedelta +from datetime import datetime from .base import IBaseCap, CapBaseObject, NotLoaded @@ -73,7 +73,7 @@ def iter_image(self): class BaseImage(CapBaseObject): def __init__(self, _id, index=None, thumbnail=NotLoaded, url=NotLoaded, ext=NotLoaded): CapBaseObject.__init__(self, unicode(_id)) - + self.add_field('index', int, index) # usually page number self.add_field('thumbnail', Thumbnail, thumbnail) self.add_field('url', basestring, url)