Rename modules

tests/test_extract_asyncdl.py

@@ -1,12 +1,12 @@
 import aiohttp
 import asyncio
 import json
-from pytchat.tool.download import parser
+from pytchat.tool.extract import parser
 import sys
 import time
 from aioresponses import aioresponses
 from concurrent.futures import CancelledError
-from pytchat.tool.download import asyncdl
+from pytchat.tool.extract import asyncdl
 
 def _open_file(path):
     with open(path,mode ='r',encoding = 'utf-8') as f:

tests/test_extract_duplcheck.py

@@ -3,10 +3,10 @@ import asyncio
 import json
 import os, sys
 import time
-from pytchat.tool.download import duplcheck
-from pytchat.tool.download import parser
-from pytchat.tool.download.block import Block
-from pytchat.tool.download.duplcheck import _dump
+from pytchat.tool.extract import duplcheck
+from pytchat.tool.extract import parser
+from pytchat.tool.extract.block import Block
+from pytchat.tool.extract.duplcheck import _dump
 def _open_file(path):
     with open(path,mode ='r',encoding = 'utf-8') as f:
         return f.read()
@@ -23,7 +23,7 @@ def test_overlap():
 
     def load_chatdata(filename):
         return parser.parse(
-            json.loads(_open_file("tests/testdata/dl_duplcheck/overlap/"+filename))
+            json.loads(_open_file("tests/testdata/extarct_duplcheck/overlap/"+filename))
         )[1]
 
     blocks = (
@@ -54,7 +54,7 @@ def test_duplicate_head():
 
     def load_chatdata(filename):
         return parser.parse(
-            json.loads(_open_file("tests/testdata/dl_duplcheck/head/"+filename))
+            json.loads(_open_file("tests/testdata/extarct_duplcheck/head/"+filename))
         )[1]
 
     """
@@ -103,7 +103,7 @@ def test_duplicate_tail():
     """
     def load_chatdata(filename):
         return parser.parse(
-            json.loads(_open_file("tests/testdata/dl_duplcheck/head/"+filename))
+            json.loads(_open_file("tests/testdata/extarct_duplcheck/head/"+filename))
         )[1]
     #chat data offsets are ignored.    
     blocks = (

tests/test_extract_patch.py

@@ -4,18 +4,18 @@ import json
 import os, sys
 import time
 from aioresponses import aioresponses
-from pytchat.tool.download import duplcheck
-from pytchat.tool.download import parser
-from pytchat.tool.download.block import Block
-from pytchat.tool.download.patch import Patch, fill, split, set_patch
-from pytchat.tool.download.duplcheck import _dump
+from pytchat.tool.extract import duplcheck
+from pytchat.tool.extract import parser
+from pytchat.tool.extract.block import Block
+from pytchat.tool.extract.patch import Patch, fill, split, set_patch
+from pytchat.tool.extract.duplcheck import _dump
 def _open_file(path):
     with open(path,mode ='r',encoding = 'utf-8') as f:
         return f.read()
 
 def load_chatdata(filename):
         return parser.parse(
-            json.loads(_open_file("tests/testdata/dl_patch/"+filename))
+            json.loads(_open_file("tests/testdata/fetch_patch/"+filename))
         )[1]
 
 
@@ -25,7 +25,7 @@ def test_split_0():
 
     ~~~~~~ before ~~~~~~
 
-     @parent_block  (# = already downloaded)
+     @parent_block  (# = already fetched)
     
      first    last                                     end
        |########----------------------------------------|
@@ -79,11 +79,11 @@ def test_split_1():
     """patch.first <= parent_block.last
 
     While awaiting at run()->asyncdl._fetch()
-    downloading parent_block proceeds, 
+    fetching parent_block proceeds, 
     and parent.block.last exceeds patch.first.
 
     In this case, fetched patch is all discarded,
-    and dlworker searches other processing block again. 
+    and worker searches other processing block again. 
 
     ~~~~~~ before ~~~~~~
 
@@ -135,7 +135,7 @@ def test_split_2():
 
     ~~~~~~ before ~~~~~~
 
-     @parent_block  (# = already downloaded)
+     @parent_block  (# = already fetched)
      first    last                           end (before split)
        |########------------------------------|
     
@@ -163,7 +163,7 @@ def test_split_2():
                           first            last=end |
                             |#################|......   cut extra data.
                                                     ^
-    continuation : None (download complete)
+    continuation : None (extract complete)
 
      @fetched patch                                 
                             |-------- patch --------|
@@ -188,11 +188,11 @@ def test_split_none():
     """patch.last <= parent_block.last
 
     While awaiting at run()->asyncdl._fetch()
-    downloading parent_block proceeds, 
+    fetching parent_block proceeds, 
     and parent.block.last exceeds patch.first.
 
     In this case, fetched patch is all discarded,
-    and dlworker searches other processing block again. 
+    and worker searches other processing block again. 
     
     ~~~~~~ before ~~~~~~