From 7588974306fc18817632e9cd607890999054fd35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Wed, 15 Oct 2014 16:17:59 +0200
Subject: [PATCH] fixed various bugs

- forgot "self." before "name_fmt"
- image keys where off by one
---
 gallery_dl/extractor/exhentai.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/gallery_dl/extractor/exhentai.py b/gallery_dl/extractor/exhentai.py
index 4e2a0d7f..edd3e4a8 100644
--- a/gallery_dl/extractor/exhentai.py
+++ b/gallery_dl/extractor/exhentai.py
@@ -28,18 +28,19 @@ class Extractor(BasicExtractor):
         text = self.request(url).text
 
         # extract information
-        _     , pos = e(text, '<div id="i3"><a onclick="return load_image(', '')
-        imgkey, pos = e(text, "'", "'", pos)
-        url   , pos = e(text, '<img id="img" src="', '"', pos)
-        name  , pos = e(text, '<div id="i4"><div>', ' :: ', pos)
-        orgurl, pos = e(text, 'http://exhentai.org/fullimg.php', '"', pos)
-        if orgurl: url = "http://exhentai.org/fullimg.php" + unescape(orgurl)
-        yield url, name_fmt.format(self.gid, 1, imgkey, name)
-
+        _       , pos = e(text, '<div id="i3"><a onclick="return load_image(', '')
+        imgkey  , pos = e(text, "'", "'", pos)
+        url     , pos = e(text, '<img id="img" src="', '"', pos)
+        name    , pos = e(text, '<div id="i4"><div>', ' :: ', pos)
+        orgurl  , pos = e(text, 'http://exhentai.org/fullimg.php', '"', pos)
         gid     , pos = e(text, 'var gid='      ,  ';', pos)
         startkey, pos = e(text, 'var startkey="', '";', pos)
         showkey , pos = e(text, 'var showkey="' , '";', pos)
 
+        #
+        if orgurl: url = "http://exhentai.org/fullimg.php" + unescape(orgurl)
+        yield url, self.name_fmt.format(self.gid, 1, startkey, name)
+
         # use json-api for further pages
         request = {
             "method" : "showpage",
@@ -60,7 +61,7 @@ class Extractor(BasicExtractor):
             name  , pos = e(info["i" ], '<div>', ' :: ')
             orgurl, pos = e(info["i7"], '<a href="', '"')
             if orgurl: url = unescape(orgurl)
-            yield url, name_fmt.format(gid, request["page"], imgkey, name)
+            yield url, self.name_fmt.format(gid, request["page"], request["imgkey"], name)
 
             if request["imgkey"] == imgkey:
                 return