diff --git a/PixivConstant.py b/PixivConstant.py index fdd91263..6eb5c017 100644 --- a/PixivConstant.py +++ b/PixivConstant.py @@ -2,7 +2,7 @@ # pylint: disable=I0011, C, C0302 -PIXIVUTIL_VERSION = '20170105-beta3' +PIXIVUTIL_VERSION = '20170131' PIXIVUTIL_LINK = 'https://github.com/Nandaka/PixivUtil2/releases' PIXIVUTIL_DONATE = 'https://bit.ly/PixivUtilDonation' PIXIV_URL = 'http://www.pixiv.net' diff --git a/PixivModel.py b/PixivModel.py index 7a16627a..f41ab8b5 100644 --- a/PixivModel.py +++ b/PixivModel.py @@ -698,6 +698,7 @@ def parseList(filename, rootDir=None): path = path.replace('\\', os.sep) listItem = PixivListItem(member_id, path) + # PixivHelper.safePrint(u"- {0} ==> {1} ".format(member_id, path)) l.append(listItem) lineNo = lineNo + 1 originalLine = "" diff --git a/PixivUtil2.py b/PixivUtil2.py index 1b260239..57a43013 100644 --- a/PixivUtil2.py +++ b/PixivUtil2.py @@ -1253,10 +1253,10 @@ def menu(): print '2. Download by image_id' print '3. Download by tags' print '4. Download from list' - print '5. Download from online user bookmark' - print '6. Download from online image bookmark' + print '5. Download from bookmarked artists (bookmark.php?type=user)' + print '6. Download from bookmarked images (bookmark.php)' print '7. Download from tags list' - print '8. Download new illust from bookmark' + print '8. Download new illust from bookmarked members (bookmark_new_illust.php)' print '9. Download by Title/Caption' print '10. Download by Tag and Member Id' print '11. Download Member Bookmark' @@ -1420,8 +1420,8 @@ def menu_download_from_list(mode, opisvalid, args): if len(test_tags) > 0: tags = test_tags - if tags is not None: - PixivHelper.safePrint("Processing member id from {0} for tags: {1}".format(list_file_name, tags)) + if tags is not None and len(tags) > 0: + PixivHelper.safePrint(u"Processing member id from {0} for tags: {1}".format(list_file_name, tags)) else: PixivHelper.safePrint("Processing member id from {0}".format(list_file_name)) @@ -1799,7 +1799,7 @@ def main(): __dbManager__.createDatabase() if __config__.useList: - list_txt = PixivListItem.parseList(__config__.downloadListDirectory + os.sep + 'list.txt') + list_txt = PixivListItem.parseList(__config__.downloadListDirectory + os.sep + 'list.txt', __config__.rootDirectory) __dbManager__.importList(list_txt) print "Updated " + str(len(list_txt)) + " items." diff --git a/changelog.txt b/changelog.txt index dea9b578..95ecaa8e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,7 +1,8 @@ -20170105-beta3: +20170131: - Fix code to enable dumping medium page by configuration. - Try to Fix Issue #182: Handle missing stats on Japanese UI. - Implement #184: Always send charset header value as utf-8. +- Fix Issue #191: handle custom directory in list.txt 20161231 - Fix Issue #181: Login using password.