jyapayne/safaribooks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed book name duplicates

Browse source
This commit is contained in:
Lorenzo Di Fuccia 2018-03-02 09:43:19 +01:00
commit 661b095df6
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
safaribooks.py
View file

@ -298,7 +298,9 @@ class SafariBooks:
self.book_title = self.book_info["title"] self.book_title = self.book_info["title"]
self.base_url = self.book_info["web_url"] self.base_url = self.book_info["web_url"]
self.clean_book_title = self.clean_dirname(self.book_title) self.clean_book_title = self.escape_dirname(self.book_title) + " ({0})".format(
self.escape_dirname(", ".join(a["name"] for a in self.book_info["authors"]), clean_space=True)
)
books_dir = os.path.join(PATH, "Books") books_dir = os.path.join(PATH, "Books")
if not os.path.isdir(books_dir): if not os.path.isdir(books_dir):
@ -657,7 +659,7 @@ class SafariBooks:
return page_css, xhtml return page_css, xhtml
@staticmethod @staticmethod
def clean_dirname(dirname): def escape_dirname(dirname, clean_space=False):
if ":" in dirname: if ":" in dirname:
if dirname.index(":") > 30: if dirname.index(":") > 30:
dirname = dirname.split(":")[0] dirname = dirname.split(":")[0]
@ -666,11 +668,11 @@ class SafariBooks:
if ch in dirname: if ch in dirname:
dirname = dirname.replace(ch, "") dirname = dirname.replace(ch, "")
return dirname return dirname if not clean_space else dirname.replace(" ", "")
def create_dirs(self): def create_dirs(self):
if os.path.isdir(self.BOOK_PATH): if os.path.isdir(self.BOOK_PATH):
self.display.log("Book directory already exists: %s" % self.book_title) self.display.log("Book directory already exists: %s" % self.BOOK_PATH)
else: else:
os.makedirs(self.BOOK_PATH) os.makedirs(self.BOOK_PATH)