fix circular dependency

- util.py imported config.py and vice versa
- Python < 3.5 doesn't like this
This commit is contained in:
Mike Fährmann
2017-08-12 21:32:24 +02:00
parent 004456d5d5
commit e3bfb8325a

View File

@@ -17,7 +17,7 @@ import random
import string import string
import hashlib import hashlib
import urllib.parse import urllib.parse
from . import config, text, exception from . import text, exception
def parse_range(rangespec): def parse_range(rangespec):
@@ -172,6 +172,11 @@ class PathFormat():
self.directory = self.realdirectory = "" self.directory = self.realdirectory = ""
self.path = self.realpath = "" self.path = self.realpath = ""
bdir = extractor.config("base-directory", (".", "gallery-dl"))
if not isinstance(bdir, str):
bdir = os.path.join(*bdir)
self.basedirectory = os.path.expanduser(os.path.expandvars(bdir))
skipmode = extractor.config("skip", True) skipmode = extractor.config("skip", True)
if skipmode == "abort": if skipmode == "abort":
self.exists = self._exists_abort self.exists = self._exists_abort
@@ -201,7 +206,7 @@ class PathFormat():
raise exception.FormatError(exc, "directory") raise exception.FormatError(exc, "directory")
self.directory = os.path.join( self.directory = os.path.join(
self.get_base_directory(), self.basedirectory,
*segments *segments
) )
self.realdirectory = self.adjust_path(self.directory) self.realdirectory = self.adjust_path(self.directory)
@@ -241,14 +246,6 @@ class PathFormat():
exit() exit()
return False return False
@staticmethod
def get_base_directory():
"""Return the base-destination-directory for downloads"""
bdir = config.get(("base-directory",), default=(".", "gallery-dl"))
if not isinstance(bdir, str):
bdir = os.path.join(*bdir)
return os.path.expanduser(os.path.expandvars(bdir))
@staticmethod @staticmethod
def adjust_path(path): def adjust_path(path):
"""Enable longer-than-260-character paths on windows""" """Enable longer-than-260-character paths on windows"""