From b5adda52dd801c01254af0b8e1275ad20b815143 Mon Sep 17 00:00:00 2001 From: yoshiko2 Date: Thu, 25 May 2023 23:39:35 +0800 Subject: [PATCH] Add source pcolle --- config.ini | 2 +- scrapinglib/api.py | 4 +++- scrapinglib/parser.py | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/config.ini b/config.ini index 02d847b..ce640d5 100755 --- a/config.ini +++ b/config.ini @@ -58,7 +58,7 @@ image_naming_with_number = 0 update_check = 1 [priority] -website = javbus,airav,jav321,fanza,xcity,mgstage,fc2,avsox,dlsite,carib,madou,getchu,javdb,gcolle,javday,javmenu,caribpr +website = javbus,airav,jav321,fanza,xcity,mgstage,fc2,avsox,dlsite,carib,madou,getchu,javdb,gcolle,javday,javmenu,pcolle,caribpr [escape] literals = \()/ diff --git a/scrapinglib/api.py b/scrapinglib/api.py index e32164f..f10bd43 100644 --- a/scrapinglib/api.py +++ b/scrapinglib/api.py @@ -34,7 +34,7 @@ class Scraping: """ adult_full_sources = ['javlibrary', 'javdb', 'javbus', 'airav', 'fanza', 'xcity', 'jav321', 'mgstage', 'fc2', 'avsox', 'dlsite', 'carib', 'madou', - 'getchu', 'gcolle', 'javday', 'pissplay', 'javmenu', 'caribpr' + 'getchu', 'gcolle', 'javday', 'pissplay', 'javmenu', 'pcolle', 'caribpr' ] general_full_sources = ['tmdb', 'imdb'] @@ -218,6 +218,8 @@ class Scraping: file_number): sources = insert(sources, "getchu") sources = insert(sources, "dlsite") + elif "pcolle" in sources and "pcolle" in lo_file_number: + sources = insert(sources, "pcolle") elif "fc2" in lo_file_number: if "fc2" in sources: sources = insert(sources, "fc2") diff --git a/scrapinglib/parser.py b/scrapinglib/parser.py index 8c8b7fa..b0cdfb7 100644 --- a/scrapinglib/parser.py +++ b/scrapinglib/parser.py @@ -4,6 +4,7 @@ import json import re from lxml import etree, html +import config from . import httprequest from .utils import getTreeElement, getTreeAll @@ -166,7 +167,8 @@ class Parser: } dic = self.extradict(dic) except Exception as e: - #print(e) + if config.getInstance().debug(): + print(e) dic = {"title": ""} js = json.dumps(dic, ensure_ascii=False, sort_keys=True, separators=(',', ':')) return js