diff --git a/Scrape.py b/Scrape.py new file mode 100644 index 0000000000000000000000000000000000000000..7c37e590fd84e835b32f8891135d71ac72c11a51 --- /dev/null +++ b/Scrape.py @@ -0,0 +1,414 @@ +import asyncio +import json +import random +import subprocess +import httpx +import tqdm +import pathlib +import backoff +import urllib.parse +import aiofiles +from concurrent.futures import ThreadPoolExecutor +from natsort import natsorted, ns +import orjson +from bs4 import BeautifulSoup +import idna +import inspect + +ROOT = pathlib.Path.cwd() +GOOGLE = False +ASYNC_CALL = 250 # No. of requests at once. + +def get_write_path(url, filename: pathlib.Path = None): + if filename is None: + path = urllib.parse.urlsplit(url).path + if path.startswith("/"): + path = path[1:] + filename = pathlib.Path(path) + filepath = ROOT.resolve() / filename + if not filepath.suffix.lower() in [".json", ".html", ".xml"]: + filepath = filepath.with_suffix(".html") + return filepath + +def record_response(response: httpx.Response, filename: pathlib.Path = None): + filepath = get_write_path(str(response.url), filename=filename) + parent = filepath.parent + reserved = ["con","prn","aux","clock","nul", + "com1","com2","com3","com4","com5", "com6","com7","com8","com9", + "lpt1","lpt2","lpt3","lpt4","lpt5", "lpt6","lpt7","lpt8","lpt9", + ] + if parent.stem in reserved: + # fuck + parent = parent.with_stem(f"!{parent.stem}") + parent.mkdir(parents=True, exist_ok=True) + (parent / filepath.name).write_text(response.text, encoding="utf-8") + +def agent(): + if GOOGLE: + return f"Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; Googlebot/2.1; +http://www.google.com/bot.html) Chrome/{random.randint(100,111)}.0.0.0 Safari/537.36" + return f"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/{random.randint(100,111)}.0.0.0 Safari/537.36" + +limits = httpx.Limits(max_keepalive_connections=None, max_connections=None) + +session = httpx.AsyncClient(limits=limits, verify=False) + +# Scraping.. - Shinon + +@backoff.on_exception(backoff.expo, httpx.HTTPError) +@backoff.on_predicate(backoff.expo) +async def get_url(url, record_filename=None, use_cached=True, no_read=False, noisy=0.0, record_func=record_response): + session.headers.update( + { + "User-Agent": agent(), + "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7", + "accept-encoding": "gzip, deflate", + "accept-language": "jp", + } + ) + if noisy: + await asyncio.sleep(random.uniform(0, noisy)) + session.cookies.clear() + session.cookies.set("age_check","1", ".blog.fc2.com") + session.cookies.set("blog_language","ja", ".blog.fc2.com") + if use_cached: + if get_write_path(url, filename=record_filename).exists(): + if no_read: + return True + return get_write_path(url, filename=record_filename).read_text(encoding="utf-8") + + try: + response = await session.get(url,) + except httpx.TimeoutException: + return False # Error? + except idna.core.InvalidCodepoint: + print(f"What: {url}") + return f'idna.core.InvalidCodepoint: {url}' + except idna.core.InvalidCodepointContext: + print(f"What: {url}") + return f'idna.core.InvalidCodepointContext {url}' + except idna.core.IDNAError: + print(f"What: {url}") + return f'idna.core.IDNAError: {url}' + except Exception as e: + print(f"What: {url}", e) + return f'Uncaught Error: {url}' + if response.status_code in [200, 404]: + if record_func: + if inspect.isawaitable(record_func): + await record_func(response, filename=record_filename) + else: + record_func(response, filename=record_filename) + return response.text + elif response.status_code in [301, 302]: + redirected = response.headers.get('location') + if "https://error.fc2.com/" in redirected: + if "https://error.fc2.com/blog/e/404/" in redirected: + return '404, does not exist.' + if "https://error.fc2.com/blog/syntax_error/" in redirected: + return 'syntax_error for requested page.' + if "https://error.fc2.com/" in redirected: + print(f"Error: {response.status_code} for {response}: {redirected} | {url}") + return False # Error? + print(f"Error: {response.status_code} for {response}: {redirected} | {url}") + return False # Error? + else: + if redirected.startswith("/"): + redirected = urllib.parse.urlunparse(urllib.parse.urlparse(url)._replace(path=redirected)) + if redirected.startswith("https://") or redirected.startswith("http://"): + # Https:// redirect + return await get_url( + redirected, record_filename=record_filename, + use_cached=use_cached, no_read=no_read, record_func=record_func) + else: + print(f"Error: {response.status_code} for {response}: {redirected} | {url}") + return False + #print(f"Error: {response.status_code} for {response}: {}") + #return False + elif response.status_code in [502, 503]: + # Retry on 502 + return False + print(f"Error: {response.status_code} for {response}") + return False + +shlk = asyncio.Queue(maxsize=10000) + +from huggingface_hub import HfApi +api = HfApi() + +def sync_upload(idx): + subprocess.call(["7zz", "a", f"/home/shinon/fc2Warui/BLiterature_{str(idx).zfill(2)}.7z", f"/home/shinon/fc2Warui/page_scrape_{idx}.jsonl"]) + api.upload_file( + path_or_fileobj=f"/home/shinon/fc2Warui/BLiterature_{str(idx).zfill(2)}.7z", + path_in_repo=f"BLiterature_{str(idx).zfill(2)}.7z", + repo_id="RyokoAI-Internal/BLiterature", + repo_type="dataset", + ) + print(f"Deleting parts: page_scrape_{idx}.jsonl | BLiterature_{str(idx).zfill(2)}.7z") + pathlib.Path(f"page_scrape_{idx}.jsonl").unlink() + pathlib.Path(f"BLiterature_{str(idx).zfill(2)}.7z").unlink() + +hf_upload_executor = ThreadPoolExecutor(10) + +async def hf_upload(idx): + loop = asyncio.get_running_loop() + await loop.run_in_executor(hf_upload_executor, sync_upload, idx) + + +async def scrape_compiled_pages(): + f = [str(f.resolve()) for f in pathlib.Path("pp").iterdir() if (f.is_file() and f.suffix.endswith(".jsonl"))] + f = natsorted(f, alg=ns.PATH) + f = [pathlib.Path(filepath) for filepath in f] + + shared_queue = asyncio.Queue(maxsize=5000) + write_queue = asyncio.Queue(maxsize=5000) + + executor = ThreadPoolExecutor(max_workers=4) + + up_tasks = [] + + write_resume = 0 + + async def write_thread(): + rotation = 0 + pbar = tqdm.tqdm(desc="Write Thread") + fs = await aiofiles.open(f"page_scrape_{rotation}.jsonl", "wb") + fs2 = await aiofiles.open(f"index.jsonl", "wb") + while True: + if write_queue.empty(): + await asyncio.sleep(0.5) + continue + buffer = [] + buffer2 = [] + while not write_queue.empty(): + q = await write_queue.get() + if q: + r = await loop.run_in_executor(executor, orjson.dumps, q) + buffer.append(r + b"\n") + buffer2.append(q[0].encode() + b"\n") + pbar.update(1) + pbar.desc = f"Write Thread: {write_queue.qsize()}" + if buffer and buffer2: + await fs.write(b"".join(buffer)) + await fs2.write(b"".join(buffer2)) + n_rotation = pbar.n // 2500000 + if n_rotation != rotation: + await fs.close() + if write_resume < n_rotation: + up_tasks.append(loop.create_task(hf_upload(rotation))) + else: + print("Not writing", f"page_scrape_{rotation}.jsonl") + rotation = n_rotation + fs = await aiofiles.open(f"page_scrape_{rotation}.jsonl", "wb") + + + if pathlib.Path("resume").exists(): + start_from = int(pathlib.Path("resume").read_text()) + write_resume = start_from // 2500000 + else: + start_from = 0 + pbaru = tqdm.tqdm(desc="Task Threads") + async def url_find(): + while True: + if shared_queue.empty(): + await asyncio.sleep(0.5) + continue + url = await shared_queue.get() + if url is not None: + await write_queue.put((url, await get_url(url, record_func=None, use_cached=False))) + else: + await write_queue.put(None) + #pbar.desc = "Task Thread: " + url.split("/")[-1] + f" {shared_queue.qsize()}" + pbaru.update(1) + loop = asyncio.get_running_loop() + tasks = [loop.create_task(url_find()) for _ in range(6000)] + [loop.create_task(write_thread())] + print(start_from, "start_from") + if start_from > 0: + print("resuming from:", start_from) + for file in f: + async with aiofiles.open(file,"r") as fp: + print(f"Process:", str(file)) + async for line in fp: + #print(line) + try: + load = await loop.run_in_executor(executor, orjson.loads, line) + except Exception as e: + print("Eror whle loading json:", line, "error", e, "file", file) + url = load[1] + #print(url) + if "/blog-entry-" in url: + #print(f"put {url}") + if start_from > 0: + url = None + start_from -= 1 + await shared_queue.put(url) + + await asyncio.gather(*up_tasks) + + + + + +async def compile_pages(): + + pbar = tqdm.tqdm(desc="Pages Parsed") + pbar2 = tqdm.tqdm(desc="Sites Parsed") + rotation = 0 + fs = await aiofiles.open(f"pages_{rotation}.jsonl", "wb") + for blog_path in pathlib.Path("blog").iterdir(): + lines = [] + if blog_path.is_file(): + continue + blog_path = blog_path / "sitemap.xml" + username = blog_path.parent.name + soup = BeautifulSoup(blog_path.read_text(encoding="utf-8", errors="ignore"),"lxml") + if soup.find("error"): + # Page probably does not exist. + return + for route in soup.find_all("loc"): + url = route.text + lines.append(orjson.dumps([username, url]) + b"\n") + pbar.update(1) + await fs.write(b"".join(lines)) + pbar2.update(1) + n_rotation = pbar.n // 2500000 + if n_rotation != rotation: + await fs.close() + rotation = n_rotation + fs = await aiofiles.open(f"pages_{rotation}.jsonl", "wb") + pbar.close() + + +async def blogs(): + sem = asyncio.Semaphore(ASYNC_CALL) + links_t = set() + loop = asyncio.get_running_loop() + for community in range(6, 53): + html = list((ROOT / pathlib.Path(f"genre/{community}/ranking")).iterdir()) + with tqdm.tqdm(total=len(html)) as pbar: + async def fetch_file(file:pathlib.Path): + async with sem: + async with aiofiles.open(file,encoding="utf-8") as f: + pbar.update(1) + return await f.read() + tasks = [loop.create_task(fetch_file(fs)) for fs in html] + contents = await asyncio.gather(*tasks, return_exceptions=True) + print("Parsing") + with tqdm.tqdm(total=len(contents)) as pbar: + for content in contents: + soup = BeautifulSoup(content, "lxml") + for links in soup.select(".blogranking_title > a"): + links_t.add(links['href']) + pbar.update(1) + del contents + (ROOT / "blogs.json").write_text(json.dumps(list(links_t), ensure_ascii=False, indent=2)) + +async def blog_sitemaps(): + sem = asyncio.Semaphore(ASYNC_CALL) + blogs = json.loads((ROOT / "blogs.json").read_text(encoding="utf-8")) + maps = [f"{blog}sitemaps.xml" for blog in blogs] + pbar = tqdm.tqdm(total=len(maps), smoothing=0.8) + def cond(url): + par = urllib.parse.urlparse(url) + username = par.netloc.split(".")[0] + fs=f"blog/{username}/sitemap.xml" + pbar.update(1) + if (ROOT / pathlib.Path(fs)).exists(): + return False + return True + maps = [sitemap for sitemap in maps if cond(sitemap)] + pbar.close() + + with tqdm.tqdm(total=len(maps), smoothing=0.8) as pbar: + async def scrape_page(url): + async with sem: + par = urllib.parse.urlparse(url) + username = par.netloc.split(".")[0] + await get_url(url, record_filename=f"blog/{username}/sitemap.xml", no_read=True, noisy=1) + pbar.update(1) + loop = asyncio.get_running_loop() + print("Creating tasks") + tasks = [loop.create_task(scrape_page(sitemap)) for sitemap in maps] + print("Task creation done. Requesting...") + await asyncio.gather(*tasks, return_exceptions=True) + + +async def genre(): + """Scrapes public blogs via the ranking category. + + """ + #root = "https://blog.fc2.com" + #community_page = await get_url("https://blog.fc2.com/community/") + #soup = BeautifulSoup(community_page, "lxml") + + #selects = soup.select("li.community_genre_item > a") + # https://blog.fc2.com/genre/52/ranking/ + sem = asyncio.Semaphore(ASYNC_CALL) + for community in range(6, 53): + print(f"https://blog.fc2.com/genre/{community}/ranking/") + community_page = await get_url(f"https://blog.fc2.com/genre/{community}/ranking/") + if isinstance(community_page, bool): + raise Exception("Weird?") + soup = BeautifulSoup(community_page, "lxml") + pagers = soup.select("div.pager > div > a") + print(pagers) + last_ref = pagers[-1]['href'] + if last_ref.startswith("/a/"): # Adult / Community 23 is... weird. + max_pg = int(last_ref.replace(f"/a/genre/ranking/","").split("/")[0]) + else: + max_pg = int(last_ref.replace(f"/genre/{community}/ranking/","").split("/")[0]) + shuffled_page = list(range(1,max_pg)) + random.shuffle(shuffled_page) + + with tqdm.tqdm(total=len(shuffled_page)) as pbar: + async def scrape_page(idx): + async with sem: + url = f"https://blog.fc2.com/genre/{community}/ranking/{idx}" + await get_url(url, no_read=True) + pbar.update(1) + loop = asyncio.get_running_loop() + tasks = [loop.create_task(scrape_page(page)) for page in shuffled_page] + await asyncio.gather(*tasks) + + + +async def communities(): + root = "https://blog.fc2.com" + community_page = await get_url("https://blog.fc2.com/community/") + soup = BeautifulSoup(community_page, "lxml") + selects = soup.select("li.community_genre_item > a") + print(f"Found: {len(selects)} communities") + sem = asyncio.Semaphore(ASYNC_CALL) + for community in selects: + community_url = root + community['href'] + print(f"comm_url: {community_url}") + community_page = await get_url(community_url) + soup = BeautifulSoup(community_page, "lxml") + pagers = soup.select("div.pager > div > a") + last_ref = pagers[-1]['href'] + shuffled_page = list(range(1,int(last_ref.replace(community['href'],"").split("/")[1]))) + random.shuffle(shuffled_page) + print(f"Max for shuffled_page: {max(shuffled_page)}") + with tqdm.tqdm(total=len(shuffled_page)) as pbar: + async def scrape_page(cat, idx): + + async with sem: + url = f"{community_url}/page/{idx}/?&order_by=member" + if not (ROOT.resolve() / f"community/category/{cat}/{idx}").with_suffix(".html").exists(): + await get_url(url, record_filename=f"community/category/{cat}/{idx}", no_read=True) + pbar.update(1) + + loop = asyncio.get_running_loop() + tasks = [loop.create_task(scrape_page(community['href'].split("/")[-2], page)) for page in shuffled_page] + await asyncio.gather(*tasks) + + +async def do(): + #await communities() + #await genre() + await scrape_compiled_pages() + #await blog_sitemaps() + await session.aclose() + + +if __name__ == "__main__": + asyncio.run(do()) diff --git a/BLiterature_00.7z b/data/BLiterature_00.7z similarity index 100% rename from BLiterature_00.7z rename to data/BLiterature_00.7z diff --git a/BLiterature_01.7z b/data/BLiterature_01.7z similarity index 100% rename from BLiterature_01.7z rename to data/BLiterature_01.7z diff --git a/BLiterature_02.7z b/data/BLiterature_02.7z similarity index 100% rename from BLiterature_02.7z rename to data/BLiterature_02.7z diff --git a/BLiterature_03.7z b/data/BLiterature_03.7z similarity index 100% rename from BLiterature_03.7z rename to data/BLiterature_03.7z diff --git a/BLiterature_04.7z b/data/BLiterature_04.7z similarity index 100% rename from BLiterature_04.7z rename to data/BLiterature_04.7z diff --git a/BLiterature_05.7z b/data/BLiterature_05.7z similarity index 100% rename from BLiterature_05.7z rename to data/BLiterature_05.7z diff --git a/BLiterature_06.7z b/data/BLiterature_06.7z similarity index 100% rename from BLiterature_06.7z rename to data/BLiterature_06.7z diff --git a/BLiterature_07.7z b/data/BLiterature_07.7z similarity index 100% rename from BLiterature_07.7z rename to data/BLiterature_07.7z diff --git a/BLiterature_08.7z b/data/BLiterature_08.7z similarity index 100% rename from BLiterature_08.7z rename to data/BLiterature_08.7z diff --git a/BLiterature_09.7z b/data/BLiterature_09.7z similarity index 100% rename from BLiterature_09.7z rename to data/BLiterature_09.7z diff --git a/BLiterature_10.7z b/data/BLiterature_10.7z similarity index 100% rename from BLiterature_10.7z rename to data/BLiterature_10.7z diff --git a/BLiterature_100.7z b/data/BLiterature_100.7z similarity index 100% rename from BLiterature_100.7z rename to data/BLiterature_100.7z diff --git a/BLiterature_101.7z b/data/BLiterature_101.7z similarity index 100% rename from BLiterature_101.7z rename to data/BLiterature_101.7z diff --git a/BLiterature_102.7z b/data/BLiterature_102.7z similarity index 100% rename from BLiterature_102.7z rename to data/BLiterature_102.7z diff --git a/BLiterature_103.7z b/data/BLiterature_103.7z similarity index 100% rename from BLiterature_103.7z rename to data/BLiterature_103.7z diff --git a/BLiterature_104.7z b/data/BLiterature_104.7z similarity index 100% rename from BLiterature_104.7z rename to data/BLiterature_104.7z diff --git a/BLiterature_11.7z b/data/BLiterature_11.7z similarity index 100% rename from BLiterature_11.7z rename to data/BLiterature_11.7z diff --git a/BLiterature_12.7z b/data/BLiterature_12.7z similarity index 100% rename from BLiterature_12.7z rename to data/BLiterature_12.7z diff --git a/BLiterature_13.7z b/data/BLiterature_13.7z similarity index 100% rename from BLiterature_13.7z rename to data/BLiterature_13.7z diff --git a/BLiterature_14.7z b/data/BLiterature_14.7z similarity index 100% rename from BLiterature_14.7z rename to data/BLiterature_14.7z diff --git a/BLiterature_15.7z b/data/BLiterature_15.7z similarity index 100% rename from BLiterature_15.7z rename to data/BLiterature_15.7z diff --git a/BLiterature_16.7z b/data/BLiterature_16.7z similarity index 100% rename from BLiterature_16.7z rename to data/BLiterature_16.7z diff --git a/BLiterature_17.7z b/data/BLiterature_17.7z similarity index 100% rename from BLiterature_17.7z rename to data/BLiterature_17.7z diff --git a/BLiterature_18.7z b/data/BLiterature_18.7z similarity index 100% rename from BLiterature_18.7z rename to data/BLiterature_18.7z diff --git a/BLiterature_19.7z b/data/BLiterature_19.7z similarity index 100% rename from BLiterature_19.7z rename to data/BLiterature_19.7z diff --git a/BLiterature_20.7z b/data/BLiterature_20.7z similarity index 100% rename from BLiterature_20.7z rename to data/BLiterature_20.7z diff --git a/BLiterature_21.7z b/data/BLiterature_21.7z similarity index 100% rename from BLiterature_21.7z rename to data/BLiterature_21.7z diff --git a/BLiterature_22.7z b/data/BLiterature_22.7z similarity index 100% rename from BLiterature_22.7z rename to data/BLiterature_22.7z diff --git a/BLiterature_23.7z b/data/BLiterature_23.7z similarity index 100% rename from BLiterature_23.7z rename to data/BLiterature_23.7z diff --git a/BLiterature_24.7z b/data/BLiterature_24.7z similarity index 100% rename from BLiterature_24.7z rename to data/BLiterature_24.7z diff --git a/BLiterature_25.7z b/data/BLiterature_25.7z similarity index 100% rename from BLiterature_25.7z rename to data/BLiterature_25.7z diff --git a/BLiterature_26.7z b/data/BLiterature_26.7z similarity index 100% rename from BLiterature_26.7z rename to data/BLiterature_26.7z diff --git a/BLiterature_27.7z b/data/BLiterature_27.7z similarity index 100% rename from BLiterature_27.7z rename to data/BLiterature_27.7z diff --git a/BLiterature_28.7z b/data/BLiterature_28.7z similarity index 100% rename from BLiterature_28.7z rename to data/BLiterature_28.7z diff --git a/BLiterature_29.7z b/data/BLiterature_29.7z similarity index 100% rename from BLiterature_29.7z rename to data/BLiterature_29.7z diff --git a/BLiterature_30.7z b/data/BLiterature_30.7z similarity index 100% rename from BLiterature_30.7z rename to data/BLiterature_30.7z diff --git a/BLiterature_31.7z b/data/BLiterature_31.7z similarity index 100% rename from BLiterature_31.7z rename to data/BLiterature_31.7z diff --git a/BLiterature_32.7z b/data/BLiterature_32.7z similarity index 100% rename from BLiterature_32.7z rename to data/BLiterature_32.7z diff --git a/BLiterature_33.7z b/data/BLiterature_33.7z similarity index 100% rename from BLiterature_33.7z rename to data/BLiterature_33.7z diff --git a/BLiterature_34.7z b/data/BLiterature_34.7z similarity index 100% rename from BLiterature_34.7z rename to data/BLiterature_34.7z diff --git a/BLiterature_35.7z b/data/BLiterature_35.7z similarity index 100% rename from BLiterature_35.7z rename to data/BLiterature_35.7z diff --git a/BLiterature_36.7z b/data/BLiterature_36.7z similarity index 100% rename from BLiterature_36.7z rename to data/BLiterature_36.7z diff --git a/BLiterature_37.7z b/data/BLiterature_37.7z similarity index 100% rename from BLiterature_37.7z rename to data/BLiterature_37.7z diff --git a/BLiterature_38.7z b/data/BLiterature_38.7z similarity index 100% rename from BLiterature_38.7z rename to data/BLiterature_38.7z diff --git a/BLiterature_39.7z b/data/BLiterature_39.7z similarity index 100% rename from BLiterature_39.7z rename to data/BLiterature_39.7z diff --git a/BLiterature_40.7z b/data/BLiterature_40.7z similarity index 100% rename from BLiterature_40.7z rename to data/BLiterature_40.7z diff --git a/BLiterature_41.7z b/data/BLiterature_41.7z similarity index 100% rename from BLiterature_41.7z rename to data/BLiterature_41.7z diff --git a/BLiterature_42.7z b/data/BLiterature_42.7z similarity index 100% rename from BLiterature_42.7z rename to data/BLiterature_42.7z diff --git a/BLiterature_43.7z b/data/BLiterature_43.7z similarity index 100% rename from BLiterature_43.7z rename to data/BLiterature_43.7z diff --git a/BLiterature_44.7z b/data/BLiterature_44.7z similarity index 100% rename from BLiterature_44.7z rename to data/BLiterature_44.7z diff --git a/BLiterature_45.7z b/data/BLiterature_45.7z similarity index 100% rename from BLiterature_45.7z rename to data/BLiterature_45.7z diff --git a/BLiterature_46.7z b/data/BLiterature_46.7z similarity index 100% rename from BLiterature_46.7z rename to data/BLiterature_46.7z diff --git a/BLiterature_47.7z b/data/BLiterature_47.7z similarity index 100% rename from BLiterature_47.7z rename to data/BLiterature_47.7z diff --git a/BLiterature_48.7z b/data/BLiterature_48.7z similarity index 100% rename from BLiterature_48.7z rename to data/BLiterature_48.7z diff --git a/BLiterature_49.7z b/data/BLiterature_49.7z similarity index 100% rename from BLiterature_49.7z rename to data/BLiterature_49.7z diff --git a/BLiterature_50.7z b/data/BLiterature_50.7z similarity index 100% rename from BLiterature_50.7z rename to data/BLiterature_50.7z diff --git a/BLiterature_51.7z b/data/BLiterature_51.7z similarity index 100% rename from BLiterature_51.7z rename to data/BLiterature_51.7z diff --git a/BLiterature_52.7z b/data/BLiterature_52.7z similarity index 100% rename from BLiterature_52.7z rename to data/BLiterature_52.7z diff --git a/BLiterature_53.7z b/data/BLiterature_53.7z similarity index 100% rename from BLiterature_53.7z rename to data/BLiterature_53.7z diff --git a/BLiterature_54.7z b/data/BLiterature_54.7z similarity index 100% rename from BLiterature_54.7z rename to data/BLiterature_54.7z diff --git a/BLiterature_55.7z b/data/BLiterature_55.7z similarity index 100% rename from BLiterature_55.7z rename to data/BLiterature_55.7z diff --git a/BLiterature_56.7z b/data/BLiterature_56.7z similarity index 100% rename from BLiterature_56.7z rename to data/BLiterature_56.7z diff --git a/BLiterature_57.7z b/data/BLiterature_57.7z similarity index 100% rename from BLiterature_57.7z rename to data/BLiterature_57.7z diff --git a/BLiterature_58.7z b/data/BLiterature_58.7z similarity index 100% rename from BLiterature_58.7z rename to data/BLiterature_58.7z diff --git a/BLiterature_59.7z b/data/BLiterature_59.7z similarity index 100% rename from BLiterature_59.7z rename to data/BLiterature_59.7z diff --git a/BLiterature_60.7z b/data/BLiterature_60.7z similarity index 100% rename from BLiterature_60.7z rename to data/BLiterature_60.7z diff --git a/BLiterature_61.7z b/data/BLiterature_61.7z similarity index 100% rename from BLiterature_61.7z rename to data/BLiterature_61.7z diff --git a/BLiterature_62.7z b/data/BLiterature_62.7z similarity index 100% rename from BLiterature_62.7z rename to data/BLiterature_62.7z diff --git a/BLiterature_63.7z b/data/BLiterature_63.7z similarity index 100% rename from BLiterature_63.7z rename to data/BLiterature_63.7z diff --git a/BLiterature_64.7z b/data/BLiterature_64.7z similarity index 100% rename from BLiterature_64.7z rename to data/BLiterature_64.7z diff --git a/BLiterature_65.7z b/data/BLiterature_65.7z similarity index 100% rename from BLiterature_65.7z rename to data/BLiterature_65.7z diff --git a/BLiterature_66.7z b/data/BLiterature_66.7z similarity index 100% rename from BLiterature_66.7z rename to data/BLiterature_66.7z diff --git a/BLiterature_67.7z b/data/BLiterature_67.7z similarity index 100% rename from BLiterature_67.7z rename to data/BLiterature_67.7z diff --git a/BLiterature_68.7z b/data/BLiterature_68.7z similarity index 100% rename from BLiterature_68.7z rename to data/BLiterature_68.7z diff --git a/BLiterature_69.7z b/data/BLiterature_69.7z similarity index 100% rename from BLiterature_69.7z rename to data/BLiterature_69.7z diff --git a/BLiterature_70.7z b/data/BLiterature_70.7z similarity index 100% rename from BLiterature_70.7z rename to data/BLiterature_70.7z diff --git a/BLiterature_71.7z b/data/BLiterature_71.7z similarity index 100% rename from BLiterature_71.7z rename to data/BLiterature_71.7z diff --git a/BLiterature_72.7z b/data/BLiterature_72.7z similarity index 100% rename from BLiterature_72.7z rename to data/BLiterature_72.7z diff --git a/BLiterature_73.7z b/data/BLiterature_73.7z similarity index 100% rename from BLiterature_73.7z rename to data/BLiterature_73.7z diff --git a/BLiterature_74.7z b/data/BLiterature_74.7z similarity index 100% rename from BLiterature_74.7z rename to data/BLiterature_74.7z diff --git a/BLiterature_75.7z b/data/BLiterature_75.7z similarity index 100% rename from BLiterature_75.7z rename to data/BLiterature_75.7z diff --git a/BLiterature_76.7z b/data/BLiterature_76.7z similarity index 100% rename from BLiterature_76.7z rename to data/BLiterature_76.7z diff --git a/BLiterature_77.7z b/data/BLiterature_77.7z similarity index 100% rename from BLiterature_77.7z rename to data/BLiterature_77.7z diff --git a/BLiterature_78.7z b/data/BLiterature_78.7z similarity index 100% rename from BLiterature_78.7z rename to data/BLiterature_78.7z diff --git a/BLiterature_79.7z b/data/BLiterature_79.7z similarity index 100% rename from BLiterature_79.7z rename to data/BLiterature_79.7z diff --git a/BLiterature_80.7z b/data/BLiterature_80.7z similarity index 100% rename from BLiterature_80.7z rename to data/BLiterature_80.7z diff --git a/BLiterature_81.7z b/data/BLiterature_81.7z similarity index 100% rename from BLiterature_81.7z rename to data/BLiterature_81.7z diff --git a/BLiterature_82.7z b/data/BLiterature_82.7z similarity index 100% rename from BLiterature_82.7z rename to data/BLiterature_82.7z diff --git a/BLiterature_83.7z b/data/BLiterature_83.7z similarity index 100% rename from BLiterature_83.7z rename to data/BLiterature_83.7z diff --git a/BLiterature_84.7z b/data/BLiterature_84.7z similarity index 100% rename from BLiterature_84.7z rename to data/BLiterature_84.7z diff --git a/BLiterature_85.7z b/data/BLiterature_85.7z similarity index 100% rename from BLiterature_85.7z rename to data/BLiterature_85.7z diff --git a/BLiterature_86.7z b/data/BLiterature_86.7z similarity index 100% rename from BLiterature_86.7z rename to data/BLiterature_86.7z diff --git a/BLiterature_87.7z b/data/BLiterature_87.7z similarity index 100% rename from BLiterature_87.7z rename to data/BLiterature_87.7z diff --git a/BLiterature_88.7z b/data/BLiterature_88.7z similarity index 100% rename from BLiterature_88.7z rename to data/BLiterature_88.7z diff --git a/BLiterature_89.7z b/data/BLiterature_89.7z similarity index 100% rename from BLiterature_89.7z rename to data/BLiterature_89.7z diff --git a/BLiterature_90.7z b/data/BLiterature_90.7z similarity index 100% rename from BLiterature_90.7z rename to data/BLiterature_90.7z diff --git a/BLiterature_91.7z b/data/BLiterature_91.7z similarity index 100% rename from BLiterature_91.7z rename to data/BLiterature_91.7z diff --git a/BLiterature_92.7z b/data/BLiterature_92.7z similarity index 100% rename from BLiterature_92.7z rename to data/BLiterature_92.7z diff --git a/BLiterature_93.7z b/data/BLiterature_93.7z similarity index 100% rename from BLiterature_93.7z rename to data/BLiterature_93.7z diff --git a/BLiterature_94.7z b/data/BLiterature_94.7z similarity index 100% rename from BLiterature_94.7z rename to data/BLiterature_94.7z diff --git a/BLiterature_95.7z b/data/BLiterature_95.7z similarity index 100% rename from BLiterature_95.7z rename to data/BLiterature_95.7z diff --git a/BLiterature_96.7z b/data/BLiterature_96.7z similarity index 100% rename from BLiterature_96.7z rename to data/BLiterature_96.7z diff --git a/BLiterature_97.7z b/data/BLiterature_97.7z similarity index 100% rename from BLiterature_97.7z rename to data/BLiterature_97.7z diff --git a/BLiterature_98.7z b/data/BLiterature_98.7z similarity index 100% rename from BLiterature_98.7z rename to data/BLiterature_98.7z diff --git a/BLiterature_99.7z b/data/BLiterature_99.7z similarity index 100% rename from BLiterature_99.7z rename to data/BLiterature_99.7z