New upstream version 1.10.3upstream/1.10.3

12 files changed, 179 insertions, 109 deletions

diff --git a/gallery_dl/downloader/http.py b/gallery_dl/downloader/http.py
index e3229eb..4c5fed5 100644
--- a/gallery_dl/downloader/http.py
+++ b/gallery_dl/downloader/http.py
@@ -38,11 +38,12 @@ class HttpDownloader(DownloaderBase):
         if self.retries < 0:
             self.retries = float("inf")
         if self.rate:
-            self.rate = text.parse_bytes(self.rate)
-            if not self.rate:
-                self.log.warning("Invalid rate limit specified")
-            elif self.rate < self.chunk_size:
-                self.chunk_size = self.rate
+            rate = text.parse_bytes(self.rate)
+            if not rate:
+                self.log.warning("Invalid rate limit (%r)", self.rate)
+            elif rate < self.chunk_size:
+                self.chunk_size = rate
+            self.rate = rate
 
     def download(self, url, pathfmt):
         try:
@@ -124,10 +125,10 @@ class HttpDownloader(DownloaderBase):
             if not offset:
                 mode = "w+b"
                 if filesize:
-                    self.log.info("Unable to resume partial download")
+                    self.log.debug("Unable to resume partial download")
             else:
                 mode = "r+b"
-                self.log.info("Resuming download at byte %d", offset)
+                self.log.debug("Resuming download at byte %d", offset)
 
             # start downloading
             self.out.start(pathfmt.path)
diff --git a/gallery_dl/downloader/ytdl.py b/gallery_dl/downloader/ytdl.py
index 7d8b905..ce921e3 100644
--- a/gallery_dl/downloader/ytdl.py
+++ b/gallery_dl/downloader/ytdl.py
@@ -8,7 +8,7 @@
 
 """Downloader module for URLs requiring youtube-dl support"""
 
-from youtube_dl import YoutubeDL
+from youtube_dl import YoutubeDL, DEFAULT_OUTTMPL
 from .common import DownloaderBase
 from .. import text
 import os
@@ -36,6 +36,9 @@ class YoutubeDLDownloader(DownloaderBase):
             options["logger"] = self.log
         self.forward_cookies = self.config("forward-cookies", True)
 
+        outtmpl = self.config("outtmpl")
+        self.outtmpl = DEFAULT_OUTTMPL if outtmpl == "default" else outtmpl
+
         self.ytdl = YoutubeDL(options)
 
     def download(self, url, pathfmt):
@@ -60,7 +63,17 @@ class YoutubeDLDownloader(DownloaderBase):
     def _download_video(self, pathfmt, info_dict):
         if "url" in info_dict:
             text.nameext_from_url(info_dict["url"], pathfmt.kwdict)
-        pathfmt.set_extension(info_dict["ext"])
+
+        if self.outtmpl:
+            self.ytdl.params["outtmpl"] = self.outtmpl
+            pathfmt.filename = filename = self.ytdl.prepare_filename(info_dict)
+            pathfmt.extension = info_dict["ext"]
+            pathfmt.path = pathfmt.directory + filename
+            pathfmt.realpath = pathfmt.temppath = (
+                pathfmt.realdirectory + filename)
+        else:
+            pathfmt.set_extension(info_dict["ext"])
+
         if pathfmt.exists():
             pathfmt.temppath = ""
             return True
diff --git a/gallery_dl/extractor/8muses.py b/gallery_dl/extractor/8muses.py
index 6fbf6b5..f5ca9ce 100644
--- a/gallery_dl/extractor/8muses.py
+++ b/gallery_dl/extractor/8muses.py
@@ -55,7 +55,7 @@ class _8musesAlbumExtractor(Extractor):
         }),
         ("https://www.8muses.com/comics/album/Fakku-Comics/6?sort=az", {
             "count": ">= 70",
-            "keyword": {"name": r"re:^[S-Zs-z]"},
+            "keyword": {"name": r"re:^[R-Zr-z]"},
         }),
     )
 
diff --git a/gallery_dl/extractor/adultempire.py b/gallery_dl/extractor/adultempire.py
index 5e2480a..85d8266 100644
--- a/gallery_dl/extractor/adultempire.py
+++ b/gallery_dl/extractor/adultempire.py
@@ -26,7 +26,7 @@ class AdultempireGalleryExtractor(GalleryExtractor):
         }),
         ("https://www.adultdvdempire.com/5683/gallery.html", {
             "url": "b12cd1a65cae8019d837505adb4d6a2c1ed4d70d",
-            "keyword": "0fe9a6e3f0a331b95ba77f66a643705ca86e8ec5",
+            "keyword": "9634eb16cc6dbf347eb9dcdd9b2a499dfd04d167",
         }),
     )
 
diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py
index bd1299b..6614755 100644
--- a/gallery_dl/extractor/deviantart.py
+++ b/gallery_dl/extractor/deviantart.py
@@ -9,7 +9,7 @@
 """Extract images from https://www.deviantart.com/"""
 
 from .common import Extractor, Message
-from .. import text, exception
+from .. import text, util, exception
 from ..cache import cache, memcache
 import collections
 import itertools
@@ -137,30 +137,37 @@ class DeviantartExtractor(Extractor):
         deviation["date"] = text.parse_timestamp(
             deviation["published_time"])
 
+        # filename metadata
+        alphabet = "0123456789abcdefghijklmnopqrstuvwxyz"
+        sub = re.compile(r"\W").sub
+        deviation["filename"] = "".join((
+            sub("_", deviation["title"].lower()), "_by_",
+            sub("_", deviation["author"]["username"].lower()), "-d",
+            util.bencode(deviation["index"], alphabet),
+        ))
+
     @staticmethod
     def commit(deviation, target):
         url = target["src"]
-        thumb = deviation["thumbs"][0]["src"] if "thumbs" in deviation else url
-        target = text.nameext_from_url(thumb, target.copy())
-        if target["filename"].endswith("-150"):
-            target["filename"] = target["filename"][:-4]
-        if not target["filename"].count("-"):
-            name, _, hid = target["filename"].rpartition("_")
-            target["filename"] = name + "-" + hid
+        target = target.copy()
+        target["filename"] = deviation["filename"]
         deviation["target"] = target
-        deviation["filename"] = target["filename"]
         deviation["extension"] = target["extension"] = text.ext_from_url(url)
         return Message.Url, url, deviation
 
     def _commit_journal_html(self, deviation, journal):
         title = text.escape(deviation["title"])
         url = deviation["url"]
-        thumbs = deviation["thumbs"]
+        thumbs = deviation.get("thumbs") or deviation.get("files")
         html = journal["html"]
         shadow = SHADOW_TEMPLATE.format_map(thumbs[0]) if thumbs else ""
 
         if "css" in journal:
             css, cls = journal["css"], "withskin"
+        elif html.startswith("<style"):
+            css, _, html = html.partition("</style>")
+            css = css.partition(">")[2]
+            cls = "withskin"
         else:
             css, cls = "", "journal-green"
 
@@ -191,22 +198,25 @@ class DeviantartExtractor(Extractor):
                 categories=categories,
             )
 
+        if needle in html:
+            html = html.replace(needle, header, 1)
+        else:
+            html = JOURNAL_TEMPLATE_HTML_EXTRA.format(header, html)
+
         html = JOURNAL_TEMPLATE_HTML.format(
-            title=title,
-            html=html.replace(needle, header, 1),
-            shadow=shadow,
-            css=css,
-            cls=cls,
-        )
+            title=title, html=html, shadow=shadow, css=css, cls=cls)
 
         deviation["extension"] = "htm"
         return Message.Url, html, deviation
 
     @staticmethod
     def _commit_journal_text(deviation, journal):
+        html = journal["html"]
+        if html.startswith("<style"):
+            html = html.partition("</style>")[2]
         content = "\n".join(
             text.unescape(text.remove_html(txt))
-            for txt in journal["html"].rpartition("<script")[0].split("<br />")
+            for txt in html.rpartition("<script")[0].split("<br />")
         )
         txt = JOURNAL_TEMPLATE_TEXT.format(
             title=deviation["title"],
@@ -302,7 +312,7 @@ class DeviantartGalleryExtractor(DeviantartExtractor):
         }),
         # 'folders' option (#276)
         ("https://www.deviantart.com/justatest235723", {
-            "count": 2,
+            "count": 3,
             "options": (("metadata", 1), ("folders", 1), ("original", 0)),
             "keyword": {
                 "description": str,
@@ -481,19 +491,21 @@ class DeviantartJournalExtractor(DeviantartExtractor):
     subcategory = "journal"
     directory_fmt = ("{category}", "{username}", "Journal")
     archive_fmt = "j_{username}_{index}.{extension}"
-    pattern = BASE_PATTERN + r"/(?:journal|blog)/?(?:\?catpath=/)?$"
+    pattern = BASE_PATTERN + r"/(?:posts(?:/journals)?|journal)/?(?:\?.*)?$"
     test = (
-        ("https://www.deviantart.com/angrywhitewanker/journal/", {
+        ("https://www.deviantart.com/angrywhitewanker/posts/journals/", {
             "url": "38db2a0d3a587a7e0f9dba7ff7d274610ebefe44",
         }),
-        ("https://www.deviantart.com/angrywhitewanker/journal/", {
+        ("https://www.deviantart.com/angrywhitewanker/posts/journals/", {
             "url": "b2a8e74d275664b1a4acee0fca0a6fd33298571e",
             "options": (("journals", "text"),),
         }),
-        ("https://www.deviantart.com/angrywhitewanker/journal/", {
+        ("https://www.deviantart.com/angrywhitewanker/posts/journals/", {
             "count": 0,
             "options": (("journals", "none"),),
         }),
+        ("https://www.deviantart.com/shimoda7/posts/"),
+        ("https://www.deviantart.com/shimoda7/journal/"),
         ("https://www.deviantart.com/shimoda7/journal/?catpath=/"),
         ("https://shimoda7.deviantart.com/journal/"),
         ("https://shimoda7.deviantart.com/journal/?catpath=/"),
@@ -546,22 +558,8 @@ class DeviantartPopularExtractor(DeviantartExtractor):
         deviation["popular"] = self.popular
 
 
-class DeviantartExtractorV2(Extractor):
+class DeviantartExtractorV2(DeviantartExtractor):
     """Base class for deviantart extractors using the NAPI"""
-    category = "deviantart"
-    directory_fmt = ("{category}", "{author[username]!l}")
-    filename_fmt = "{category}_{index}_{title}.{extension}"
-    root = "https://www.deviantart.com"
-
-    def __init__(self, match=None):
-        Extractor.__init__(self, match)
-        self.offset = 0
-        self.extra = self.config("extra", False)
-        self.quality = self.config("quality", "100")
-        self.user = match.group(1) or match.group(2)
-
-        if self.quality:
-            self.quality = "q_{}".format(self.quality)
 
     def items(self):
         url = (
@@ -621,15 +619,17 @@ class DeviantartExtractorV2(Extractor):
 
         # extract download target
         target = files[-1]
-        name = files[0]["src"]
 
-        if target["type"] == "gif":
+        if deviation["isJournal"] and self.commit_journal:
+            journal = deviation["textContent"]
+            journal["html"] = journal["html"]["markup"]
+            target["src"] = self.commit_journal(deviation, journal)[1]
+        elif target["type"] == "gif":
             pass
         elif target["type"] == "video":
             # select largest video
             target = max(
                 files, key=lambda x: text.parse_int(x.get("quality", "")[:-1]))
-            name = target["src"]
         elif target["type"] == "flash":
             if target["src"].startswith("https://sandbox.deviantart.com"):
                 # extract SWF file from "sandbox"
@@ -641,9 +641,7 @@ class DeviantartExtractorV2(Extractor):
             target = extended["download"]
             target["src"] = target["url"]
             del target["url"]
-
-        # url rewrites
-        if target["src"].startswith("https://images-wixmp-"):
+        elif target["src"].startswith("https://images-wixmp-"):
             if deviation["index"] <= 790677560:
                 # https://github.com/r888888888/danbooru/issues/4069
                 target["src"] = re.sub(
@@ -653,16 +651,20 @@ class DeviantartExtractorV2(Extractor):
                 target["src"] = re.sub(
                     r"q_\d+", self.quality, target["src"])
 
-        text.nameext_from_url(name, target)
-        if target["filename"].endswith("-150"):
-            target["filename"] = target["filename"][:-4]
-        if not target["filename"].count("-"):
-            name, _, hid = target["filename"].rpartition("_")
-            target["filename"] = name + "-" + hid
+        # filename and extension metadata
+        alphabet = "0123456789abcdefghijklmnopqrstuvwxyz"
+        sub = re.compile(r"\W").sub
+        deviation["filename"] = target["filename"] = "".join((
+            sub("_", deviation["title"].lower()), "_by_",
+            sub("_", deviation["author"]["username"].lower()), "-d",
+            util.bencode(deviation["index"], alphabet),
+        ))
+        if "extension" not in deviation:
+            deviation["extension"] = target["extension"] = (
+                text.ext_from_url(target["src"])
+            )
         deviation["target"] = target
-        deviation["filename"] = target["filename"]
-        deviation["extension"] = target["extension"] = (
-            text.ext_from_url(target["src"]))
+
         return deviation
 
 
@@ -1118,6 +1120,27 @@ roses/cssmin/desktop.css?1491362542749" >
 </html>
 """
 
+JOURNAL_TEMPLATE_HTML_EXTRA = """\
+<div id="devskin0"><div class="negate-box-margin" style="">\
+<div usr class="gr-box gr-genericbox"
+        ><i usr class="gr1"><i></i></i
+        ><i usr class="gr2"><i></i></i
+        ><i usr class="gr3"><i></i></i
+        ><div usr class="gr-top">
+            <i usr class="tri"></i>
+            {}
+            </div>
+    </div><div usr class="gr-body"><div usr class="gr">
+            <div class="grf-indent">
+            <div class="text">
+                {}            </div>
+        </div>
+                </div></div>
+        <i usr class="gr3 gb"></i>
+        <i usr class="gr2 gb"></i>
+        <i usr class="gr1 gb gb1"></i>    </div>
+    </div></div>"""
+
 JOURNAL_TEMPLATE_TEXT = """text:{title}
 by {username}, {date}
 
diff --git a/gallery_dl/extractor/flickr.py b/gallery_dl/extractor/flickr.py
index d941d76..73b8ec4 100644
--- a/gallery_dl/extractor/flickr.py
+++ b/gallery_dl/extractor/flickr.py
@@ -25,12 +25,20 @@ class FlickrExtractor(Extractor):
 
     def items(self):
         data = self.metadata()
+        extract = self.api._extract_format
         yield Message.Version, 1
         yield Message.Directory, data
         for photo in self.photos():
-            photo.update(data)
-            url = photo["url"]
-            yield Message.Url, url, text.nameext_from_url(url, photo)
+            try:
+                photo = extract(photo)
+            except Exception as exc:
+                self.log.warning(
+                    "Skipping %s (%s)", photo["id"], exc.__class__.__name__)
+                self.log.debug("", exc_info=True)
+            else:
+                photo.update(data)
+                url = photo["url"]
+                yield Message.Url, url, text.nameext_from_url(url, photo)
 
     def metadata(self):
         """Return general metadata"""
@@ -432,7 +440,7 @@ class FlickrAPI(oauth.OAuth1API):
 
         while True:
             data = self._call(method, params)[key]
-            yield from map(self._extract_format, data["photo"])
+            yield from data["photo"]
             if params["page"] >= data["pages"]:
                 return
             params["page"] += 1
diff --git a/gallery_dl/extractor/piczel.py b/gallery_dl/extractor/piczel.py
index 6a5c41c..2775dac 100644
--- a/gallery_dl/extractor/piczel.py
+++ b/gallery_dl/extractor/piczel.py
@@ -6,7 +6,7 @@
 # it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
 
-"""Extract images from https://piczel.tv/"""
+"""Extractors for https://piczel.tv/"""
 
 from .common import Extractor, Message
 from .. import text
@@ -19,21 +19,12 @@ class PiczelExtractor(Extractor):
     filename_fmt = "{category}_{id}_{title}_{num:>02}.{extension}"
     archive_fmt = "{id}_{num}"
     root = "https://piczel.tv"
-    api_root = "https://apollo.piczel.tv"
-
-    def __init__(self, match):
-        Extractor.__init__(self, match)
-        self.item_id = match.group(1)
 
     def items(self):
-        first = True
         yield Message.Version, 1
-        for image in self.unpack(self.get_images()):
-            if first:
-                yield Message.Directory, image
-                first = False
-            path = image["image"]["image"]["url"]
-            url = "{}/static/{}".format(self.api_root, path)
+        for image in self.unpack(self.images()):
+            url = self.root + "/static" + image["image"]["image"]["url"]
+            yield Message.Directory, image
             yield Message.Url, url, text.nameext_from_url(url, image)
 
     @staticmethod
@@ -50,21 +41,40 @@ class PiczelExtractor(Extractor):
                 image["num"] = 0
                 yield image
 
-    def get_images(self):
+    def images(self):
         """Return an iterable with all relevant image objects"""
 
+    def _pagination(self, url, folder_id=None):
+        params = {
+            "hideNsfw" : "false",
+            "from_id"  : None,
+            "folder_id": folder_id,
+        }
+
+        while True:
+            data = self.request(url, params=params).json()
+            yield from data
+
+            if len(data) < 32:
+                return
+            params["from_id"] = data[-1]["id"]
+
 
 class PiczelUserExtractor(PiczelExtractor):
     """Extractor for all images from a user's gallery"""
     subcategory = "user"
     pattern = r"(?:https?://)?(?:www\.)?piczel\.tv/gallery/([^/?&#]+)/?$"
-    test = ("https://piczel.tv/gallery/Lulena", {
-        "count": ">= 13",
+    test = ("https://piczel.tv/gallery/Maximumwarp", {
+        "count": ">= 50",
     })
 
-    def get_images(self):
-        url = "{}/api/users/{}/gallery".format(self.api_root, self.item_id)
-        return self.request(url).json()
+    def __init__(self, match):
+        PiczelExtractor.__init__(self, match)
+        self.user = match.group(1)
+
+    def images(self):
+        url = "{}/api/users/{}/gallery".format(self.root, self.user)
+        return self._pagination(url)
 
 
 class PiczelFolderExtractor(PiczelExtractor):
@@ -73,16 +83,18 @@ class PiczelFolderExtractor(PiczelExtractor):
     directory_fmt = ("{category}", "{user[username]}", "{folder[name]}")
     archive_fmt = "f{folder[id]}_{id}_{num}"
     pattern = (r"(?:https?://)?(?:www\.)?piczel\.tv"
-               r"/gallery/(?!image)[^/?&#]+/(\d+)")
+               r"/gallery/(?!image)([^/?&#]+)/(\d+)")
     test = ("https://piczel.tv/gallery/Lulena/1114", {
         "count": ">= 4",
     })
 
-    def get_images(self):
-        url = "{}/api/gallery/folder/{}".format(self.api_root, self.item_id)
-        images = self.request(url).json()
-        images.reverse()
-        return images
+    def __init__(self, match):
+        PiczelExtractor.__init__(self, match)
+        self.user, self.folder_id = match.groups()
+
+    def images(self):
+        url = "{}/api/users/{}/gallery".format(self.root, self.user)
+        return self._pagination(url, self.folder_id)
 
 
 class PiczelImageExtractor(PiczelExtractor):
@@ -90,7 +102,7 @@ class PiczelImageExtractor(PiczelExtractor):
     subcategory = "image"
     pattern = r"(?:https?://)?(?:www\.)?piczel\.tv/gallery/image/(\d+)"
     test = ("https://piczel.tv/gallery/image/7807", {
-        "url": "9b9e416b6ab7e58676fab84453d5028f306ece34",
+        "url": "85225dd53a03c3b6028f6c4a45b71eccc07f7066",
         "content": "df9a053a24234474a19bce2b7e27e0dec23bff87",
         "keyword": {
             "created_at": "2018-07-22T05:13:58.000Z",
@@ -113,6 +125,10 @@ class PiczelImageExtractor(PiczelExtractor):
         },
     })
 
-    def get_images(self):
-        url = "{}/api/gallery/image/{}".format(self.api_root, self.item_id)
+    def __init__(self, match):
+        PiczelExtractor.__init__(self, match)
+        self.image_id = match.group(1)
+
+    def images(self):
+        url = "{}/api/gallery/image/{}".format(self.root, self.image_id)
         return (self.request(url).json(),)
diff --git a/gallery_dl/extractor/pornhub.py b/gallery_dl/extractor/pornhub.py
index 40816b3..bbbc709 100644
--- a/gallery_dl/extractor/pornhub.py
+++ b/gallery_dl/extractor/pornhub.py
@@ -123,7 +123,7 @@ class PornhubUserExtractor(PornhubExtractor):
     test = (
         ("https://www.pornhub.com/users/flyings0l0/photos/public", {
             "pattern": PornhubGalleryExtractor.pattern,
-            "count": ">= 8",
+            "count": ">= 6",
         }),
         ("https://www.pornhub.com/users/flyings0l0/"),
         ("https://www.pornhub.com/users/flyings0l0/photos/public"),
diff --git a/gallery_dl/extractor/seiga.py b/gallery_dl/extractor/seiga.py
index 0d92573..69962c8 100644
--- a/gallery_dl/extractor/seiga.py
+++ b/gallery_dl/extractor/seiga.py
@@ -70,7 +70,7 @@ class SeigaUserExtractor(SeigaExtractor):
     subcategory = "user"
     directory_fmt = ("{category}", "{user[id]}")
     filename_fmt = "{category}_{user[id]}_{image_id}.{extension}"
-    pattern = (r"(?:https?://)?(?:www\.|seiga\.)?nicovideo\.jp/"
+    pattern = (r"(?:https?://)?(?:www\.|(?:sp\.)?seiga\.)?nicovideo\.jp/"
                r"user/illust/(\d+)(?:\?(?:[^&]+&)*sort=([^&#]+))?")
     test = (
         ("https://seiga.nicovideo.jp/user/illust/39537793", {
@@ -96,6 +96,7 @@ class SeigaUserExtractor(SeigaExtractor):
         }),
         ("https://seiga.nicovideo.jp/user/illust/39537793"
          "?sort=image_view&target=illust_all"),
+        ("https://sp.seiga.nicovideo.jp/user/illust/39537793"),
     )
 
     def __init__(self, match):
@@ -167,6 +168,7 @@ class SeigaImageExtractor(SeigaExtractor):
     filename_fmt = "{category}_{image_id}.{extension}"
     pattern = (r"(?:https?://)?(?:"
                r"(?:seiga\.|www\.)?nicovideo\.jp/(?:seiga/im|image/source/)"
+               r"|sp\.seiga\.nicovideo\.jp/seiga/#!/im"
                r"|lohas\.nicoseiga\.jp/(?:thumb|(?:priv|o)/[^/]+/\d+)/)(\d+)")
     test = (
         ("https://seiga.nicovideo.jp/seiga/im5977527", {
@@ -177,6 +179,7 @@ class SeigaImageExtractor(SeigaExtractor):
             "exception": exception.NotFoundError,
         }),
         ("https://seiga.nicovideo.jp/image/source/5977527"),
+        ("https://sp.seiga.nicovideo.jp/seiga/#!/im5977527"),
         ("https://lohas.nicoseiga.jp/thumb/5977527i"),
         ("https://lohas.nicoseiga.jp/priv"
          "/759a4ef1c639106ba4d665ee6333832e647d0e4e/1549727594/5977527"),
diff --git a/gallery_dl/postprocessor/zip.py b/gallery_dl/postprocessor/zip.py
index 1075c70..6659a8d 100644
--- a/gallery_dl/postprocessor/zip.py
+++ b/gallery_dl/postprocessor/zip.py
@@ -34,7 +34,7 @@ class ZipPP(PostProcessor):
             algorithm = "store"
 
         self.path = pathfmt.realdirectory
-        args = (self.path + ext, "a",
+        args = (self.path[:-1] + ext, "a",
                 self.COMPRESSION_ALGORITHMS[algorithm], True)
 
         if options.get("mode") == "safe":
diff --git a/gallery_dl/util.py b/gallery_dl/util.py
index 79fa175..17cd73a 100644
--- a/gallery_dl/util.py
+++ b/gallery_dl/util.py
@@ -608,11 +608,13 @@ class PathFormat():
         """Build directory path and create it if necessary"""
 
         # Build path segments by applying 'kwdict' to directory format strings
+        segments = []
+        append = segments.append
         try:
-            segments = [
-                self.clean_segment(format_map(kwdict).strip())
-                for format_map in self.directory_formatters
-            ]
+            for formatter in self.directory_formatters:
+                segment = formatter(kwdict).strip()
+                if segment:
+                    append(self.clean_segment(segment))
         except Exception as exc:
             raise exception.FormatError(exc, "directory")
 
@@ -620,16 +622,20 @@ class PathFormat():
         sep = os.sep
         directory = self.clean_path(self.basedirectory + sep.join(segments))
 
-        # Ensure directory ends with a path separator
-        if directory[-1] != sep:
+        # Ensure 'directory' ends with a path separator
+        if segments:
             directory += sep
         self.directory = directory
 
-        # Enable longer-than-260-character paths on Windows
         if os.name == "nt":
-            self.realdirectory = "\\\\?\\" + os.path.abspath(directory) + sep
-        else:
-            self.realdirectory = directory
+            # Enable longer-than-260-character paths on Windows
+            directory = "\\\\?\\" + os.path.abspath(directory)
+
+            # abspath() in Python 3.7+ removes trailing path separators (#402)
+            if directory[-1] != sep:
+                directory += sep
+
+        self.realdirectory = directory
 
         # Create directory tree
         os.makedirs(self.realdirectory, exist_ok=True)
diff --git a/gallery_dl/version.py b/gallery_dl/version.py
index 911939d..cbb8fe7 100644
--- a/gallery_dl/version.py
+++ b/gallery_dl/version.py
@@ -6,4 +6,4 @@
 # it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
 
-__version__ = "1.10.2"
+__version__ = "1.10.3"