diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8c4ff8d..d33f837 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,10 +2,17 @@ - + + + + + + + + + - - + @@ -25,11 +32,11 @@ - + - + @@ -38,84 +45,16 @@ - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -131,11 +70,9 @@ @@ -271,7 +208,7 @@ - + - + + - + @@ -553,7 +485,6 @@ - @@ -570,56 +501,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -627,6 +515,7 @@ + @@ -634,12 +523,23 @@ + + + + + + + + + + + - + @@ -649,67 +549,11 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/1.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/1.jpg deleted file mode 100644 index ff37b23..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/1.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/10.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/10.jpg deleted file mode 100644 index e3a2db6..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/10.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/11.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/11.jpg deleted file mode 100644 index b390886..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/11.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/12.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/12.jpg deleted file mode 100644 index b2cfc56..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/12.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/13.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/13.jpg deleted file mode 100644 index dd727db..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/13.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/14.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/14.jpg deleted file mode 100644 index fc313ab..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/14.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/15.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/15.jpg deleted file mode 100644 index 5d05d58..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/15.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/16.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/16.jpg deleted file mode 100644 index 570b4da..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/16.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/17.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/17.jpg deleted file mode 100644 index ee38a21..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/17.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/18.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/18.jpg deleted file mode 100644 index b816f31..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/18.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/19.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/19.jpg deleted file mode 100644 index 43375b0..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/19.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/2.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/2.jpg deleted file mode 100644 index edd4857..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/2.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/20.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/20.jpg deleted file mode 100644 index 960e4c6..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/20.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/21.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/21.jpg deleted file mode 100644 index 7e65a07..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/21.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/22.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/22.jpg deleted file mode 100644 index 7a32fb5..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/22.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/23.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/23.jpg deleted file mode 100644 index 54dd8c5..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/23.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/24.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/24.jpg deleted file mode 100644 index 0a1a9e2..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/24.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/25.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/25.jpg deleted file mode 100644 index c41d4b3..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/25.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/26.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/26.jpg deleted file mode 100644 index d42d0d9..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/26.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/27.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/27.jpg deleted file mode 100644 index a07ede2..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/27.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/28.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/28.jpg deleted file mode 100644 index 41794ba..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/28.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/29.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/29.jpg deleted file mode 100644 index c65a92b..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/29.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/3.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/3.jpg deleted file mode 100644 index ea7b1b7..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/3.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/30.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/30.jpg deleted file mode 100644 index 46f34ff..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/30.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/4.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/4.jpg deleted file mode 100644 index 20357a6..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/4.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/5.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/5.jpg deleted file mode 100644 index 9960301..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/5.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/6.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/6.jpg deleted file mode 100644 index c4f91b4..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/6.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/7.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/7.jpg deleted file mode 100644 index 45455fd..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/7.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/8.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/8.jpg deleted file mode 100644 index 677b5c1..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/8.jpg and /dev/null differ diff --git a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/9.jpg b/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/9.jpg deleted file mode 100644 index de6dbfc..0000000 Binary files a/comic_dl/Sons Of Anarchy Redwood Original/Chapter 6/9.jpg and /dev/null differ diff --git a/comic_dl/downloader/__pycache__/__init__.cpython-35.pyc b/comic_dl/downloader/__pycache__/__init__.cpython-35.pyc new file mode 100644 index 0000000..a1aff0f Binary files /dev/null and b/comic_dl/downloader/__pycache__/__init__.cpython-35.pyc differ diff --git a/comic_dl/downloader/__pycache__/cookies_required.cpython-35.pyc b/comic_dl/downloader/__pycache__/cookies_required.cpython-35.pyc new file mode 100644 index 0000000..904195d Binary files /dev/null and b/comic_dl/downloader/__pycache__/cookies_required.cpython-35.pyc differ diff --git a/comic_dl/downloader/__pycache__/universal.cpython-35.pyc b/comic_dl/downloader/__pycache__/universal.cpython-35.pyc new file mode 100644 index 0000000..ef3ef28 Binary files /dev/null and b/comic_dl/downloader/__pycache__/universal.cpython-35.pyc differ diff --git a/comic_dl/honcho.py b/comic_dl/honcho.py index fc6fd52..ac55ebd 100644 --- a/comic_dl/honcho.py +++ b/comic_dl/honcho.py @@ -20,7 +20,6 @@ from sites.batoto import batoto_Url_Check from sites.kissmanga import kissmanga_Url_Check from sites.comic_naver import comic_naver_Url_Check from sites.readcomic import readcomic_Url_Check -from sites.kisscomicus import kissmcomicus_Url_Check from downloader import universal,cookies_required from urllib.parse import urlparse @@ -48,12 +47,8 @@ def url_checker(input_url, current_directory, User_Name, User_Password): elif domain in ['comic.naver.com']: comic_naver_Url_Check(input_url, current_directory) - elif domain in ['readcomiconline.to']: readcomic_Url_Check(input_url, current_directory) - - elif domain in ['kisscomic.us']: - kissmcomicus_Url_Check(input_url, current_directory) elif domain in ['']: print('You need to specify at least 1 URL. Please run : comic-dl -h') diff --git a/comic_dl/honcho.pyc b/comic_dl/honcho.pyc deleted file mode 100644 index 87d2a44..0000000 Binary files a/comic_dl/honcho.pyc and /dev/null differ diff --git a/comic_dl/sites/__init__.pyc b/comic_dl/sites/__init__.pyc deleted file mode 100644 index 9ca6968..0000000 Binary files a/comic_dl/sites/__init__.pyc and /dev/null differ diff --git a/comic_dl/sites/batoto.pyc b/comic_dl/sites/batoto.pyc deleted file mode 100644 index 35c1cb1..0000000 Binary files a/comic_dl/sites/batoto.pyc and /dev/null differ diff --git a/comic_dl/sites/comic_naver.pyc b/comic_dl/sites/comic_naver.pyc deleted file mode 100644 index 59282be..0000000 Binary files a/comic_dl/sites/comic_naver.pyc and /dev/null differ diff --git a/comic_dl/sites/gomanga.pyc b/comic_dl/sites/gomanga.pyc deleted file mode 100644 index 13a23f5..0000000 Binary files a/comic_dl/sites/gomanga.pyc and /dev/null differ diff --git a/comic_dl/sites/kisscomicus.py b/comic_dl/sites/kisscomicus.py deleted file mode 100644 index 445adef..0000000 --- a/comic_dl/sites/kisscomicus.py +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -import cfscrape -import re -from bs4 import BeautifulSoup -import os -# from downloader.universal import main as FileDownloader -from downloader.cookies_required import main as FileDownloader -import requests - -def single_chapter(url, directory): - # print("I'm single!") - sess = requests.session() - sess = cfscrape.create_scraper(sess) - s = sess.get(url) - cookies = sess.cookies - connection = s.text.encode('utf-8') - # print(cookies) - - soup = BeautifulSoup(connection, "html.parser") - Series_Name_Finder = soup.findAll('ul', {'class': 'back-info'}) - for link in Series_Name_Finder: - x = link.findAll('a') - for a in x: - # print(a['href']) - raw_name = a['href'] - Series_Name = str(raw_name.split("/")[2]).replace(".html","").replace("-"," ").title().strip() - # print("Series Name : %s" % Series_Name) - chapter_number = int(str(url).split("-")[-1].replace(".html","")) - # print("Chapter Number : %s" % chapter_number) - - Raw_File_Directory = str(Series_Name) + '/' + "Chapter " + str(chapter_number) - - File_Directory = re.sub('[^A-Za-z0-9\-\.\'\#\/ ]+', '', - Raw_File_Directory) # Fix for "Special Characters" in The series name - - Directory_path = os.path.normpath(File_Directory) - - print('\n') - print('{:^80}'.format('=====================================================================\n')) - print('{:^80}'.format('%s - %s') % (Series_Name, chapter_number)) - print('{:^80}'.format('=====================================================================\n')) - - # soup = BeautifulSoup(connection, "html.parser") - linkFinder = soup.findAll('ul', {'class': 'list-image'}) - # print("Link Finder :s %s" % linkFinder) - for link in linkFinder: - x = link.findAll('img') - for a in x: - if not os.path.exists(File_Directory): - os.makedirs(File_Directory) - ddlLink = a['src'] - fileName = str(ddlLink).split("/")[-1].strip() - # print("Link : %s\nFile Name : %s" % (ddlLink, fileName)) - FileDownloader(File_Name_Final=fileName, Directory_path=File_Directory, tasty_cookies=cookies, ddl_image=ddlLink, ) - - print('\n') - print("Completed downloading %s" % Series_Name) - -def whole_series(url, directory): - print("I'm NOT single!") - -def kissmcomicus_Url_Check(input_url, current_directory): - kissmcomicus_single_regex = re.compile('https?://(?P[^/]+)/chapters/(?P[\d\w-]+)(?:/Issue-)?') - kissmcomicus_whole_regex = re.compile('https?://(?P[^/]+)/comics/(?P[\d\w-]+)?') - - lines = input_url.split('\n') - for line in lines: - found = re.search(kissmcomicus_single_regex, line) - if found: - match = found.groupdict() - if match['comic']: - url = str(input_url) - single_chapter(url, current_directory) - else: - pass - - found = re.search(kissmcomicus_whole_regex, line) - if found: - match = found.groupdict() - if match['comic_name']: - url = str(input_url) - whole_series(url, current_directory) - else: - pass \ No newline at end of file diff --git a/comic_dl/sites/kisscomicus.pyc b/comic_dl/sites/kisscomicus.pyc deleted file mode 100644 index c990f14..0000000 Binary files a/comic_dl/sites/kisscomicus.pyc and /dev/null differ diff --git a/comic_dl/sites/kissmanga.pyc b/comic_dl/sites/kissmanga.pyc deleted file mode 100644 index a13b17d..0000000 Binary files a/comic_dl/sites/kissmanga.pyc and /dev/null differ diff --git a/comic_dl/sites/mangafox.pyc b/comic_dl/sites/mangafox.pyc deleted file mode 100644 index b06b542..0000000 Binary files a/comic_dl/sites/mangafox.pyc and /dev/null differ diff --git a/comic_dl/sites/readcomic.pyc b/comic_dl/sites/readcomic.pyc deleted file mode 100644 index c7abb16..0000000 Binary files a/comic_dl/sites/readcomic.pyc and /dev/null differ diff --git a/comic_dl/sites/yomanga.py b/comic_dl/sites/yomanga.py index 265731f..6836d12 100644 --- a/comic_dl/sites/yomanga.py +++ b/comic_dl/sites/yomanga.py @@ -25,7 +25,6 @@ def single_chapter(url,current_directory): s = requests.Session() response = s.get(url, headers=headers) tasty_cookies = response.cookies - # print(tasty_cookies) Page_source = str(response.text.encode('utf-8')) diff --git a/comic_dl/sites/yomanga.pyc b/comic_dl/sites/yomanga.pyc deleted file mode 100644 index 0d68894..0000000 Binary files a/comic_dl/sites/yomanga.pyc and /dev/null differ diff --git a/comic_dl/version.py b/comic_dl/version.py index 7e6e3b5..bd4068d 100644 --- a/comic_dl/version.py +++ b/comic_dl/version.py @@ -4,4 +4,4 @@ Date Format : YY/MM/DD ''' -__version__ = '2017.01.12' +__version__ = '2017.01.02' diff --git a/comic_dl/version.pyc b/comic_dl/version.pyc deleted file mode 100644 index f67065f..0000000 Binary files a/comic_dl/version.pyc and /dev/null differ