Arav/ScrapTheChan
1
0
Fork 0
Code Releases 8 Activity

FIxed arguments for a match function.

Browse Source
This commit is contained in:
Alexander Andreev 2020-11-18 23:44:36 +04:00
parent 6a54b88498
commit 647a787974
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scrapthechan/parsers/eightkun.py
View File

@ -38,7 +38,7 @@ class EightKunParser(Parser):
dlfname = f"{post['tim']}{post['ext']}" dlfname = f"{post['tim']}{post['ext']}"
if "filename" in post: if "filename" in post:
if match(post['filename'], r"^image\.\w{1,4}$") is None: if match(r"^image\.\w+$", post['filename']) is None:
filename = dlfname filename = dlfname
else: else:
filename = f"{post['filename']}{post['ext']}" filename = f"{post['filename']}{post['ext']}"
@ -52,7 +52,7 @@ class EightKunParser(Parser):
for f in post["extra_files"]: for f in post["extra_files"]:
dlfname = f"{f['tim']}{f['ext']}" dlfname = f"{f['tim']}{f['ext']}"
if "filename" in post: if "filename" in post:
if match(post['filename'], r"^image\.\w+$") is None: if match(r"^image\.\w+$", post['filename']) is None:
filename = dlfname filename = dlfname
else: else:
filename = f"{post['filename']}{post['ext']}" filename = f"{post['filename']}{post['ext']}"

2
scrapthechan/parsers/fourchan.py
View File

@ -38,7 +38,7 @@ class FourChanParser(Parser):
dlfname = f"{post['tim']}{post['ext']}" dlfname = f"{post['tim']}{post['ext']}"
if "filename" in post: if "filename" in post:
if match(post['filename'], r"^image\.\w{1,4}$") is None: if match(r"^image\.\w+$", post['filename']) is None:
filename = dlfname filename = dlfname
else: else:
filename = f"{post['filename']}{post['ext']}" filename = f"{post['filename']}{post['ext']}"

4
scrapthechan/parsers/lainchan.py
View File

@ -41,7 +41,7 @@ class LainchanParser(Parser):
dlfname = f"{post['tim']}{post['ext']}" dlfname = f"{post['tim']}{post['ext']}"
if "filename" in post: if "filename" in post:
if match(post['filename'], r"^image\.\w{1,4}$") is None: if match(r"^image\.\w+$", post['filename']) is None:
filename = dlfname filename = dlfname
else: else:
filename = f"{post['filename']}{post['ext']}" filename = f"{post['filename']}{post['ext']}"
@ -55,7 +55,7 @@ class LainchanParser(Parser):
for f in post["extra_files"]: for f in post["extra_files"]:
dlfname = f"{f['tim']}{f['ext']}" dlfname = f"{f['tim']}{f['ext']}"
if "filename" in post: if "filename" in post:
if match(post['filename'], r"^image\.\w+$") is None: if match(r"^image\.\w+$", post['filename']) is None:
filename = dlfname filename = dlfname
else: else:
filename = f"{post['filename']}{post['ext']}" filename = f"{post['filename']}{post['ext']}"

6
scrapthechan/parsers/lolifox.py
View File

@ -24,7 +24,7 @@ class LolifoxParser(Parser):
@property @property
def imageboard(self) -> str: def imageboard(self) -> str:
return "lolifox.cc" return "lolifox.cc"
@property @property
def op(self) -> Optional[str]: def op(self) -> Optional[str]:
op = "" op = ""
@ -40,7 +40,7 @@ class LolifoxParser(Parser):
dlfname = f"{post['tim']}{post['ext']}" dlfname = f"{post['tim']}{post['ext']}"
if "filename" in post: if "filename" in post:
if match(post['filename'], r"^image\.\w{1,4}$") is None: if match(r"^image\.\w+$", post['filename']) is None:
filename = dlfname filename = dlfname
else: else:
filename = f"{post['filename']}{post['ext']}" filename = f"{post['filename']}{post['ext']}"
@ -54,7 +54,7 @@ class LolifoxParser(Parser):
for f in post["extra_files"]: for f in post["extra_files"]:
dlfname = f"{f['tim']}{f['ext']}" dlfname = f"{f['tim']}{f['ext']}"
if "filename" in post: if "filename" in post:
if match(post['filename'], r"^image\.\w+$") is None: if match(r"^image\.\w+$", post['filename']) is None:
filename = dlfname filename = dlfname
else: else:
filename = f"{post['filename']}{post['ext']}" filename = f"{post['filename']}{post['ext']}"