mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-17 09:02:15 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix linter warnings + a test

Browse source
This commit is contained in:
ed 2024-03-18 15:25:10 +00:00
parent 0287c7baa5
commit 2def4cd248
5 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
copyparty/httpcli.py
View file

@ -323,9 +323,7 @@ class HttpCli(object):
if "." in pip if "." in pip
else ":".join(pip.split(":")[:4]) + ":" else ":".join(pip.split(":")[:4]) + ":"
) + "0.0/16" ) + "0.0/16"
zs2 = ( zs2 = ' or "--xff-src=lan"' if self.conn.xff_lan.map(pip) else ""
' or "--xff-src=lan"' if self.conn.hsrv.xff_lan.map(pip) else ""
)
self.log(t % (self.args.xff_hdr, pip, cli_ip, zso, zs, zs2), 3) self.log(t % (self.args.xff_hdr, pip, cli_ip, zso, zs, zs2), 3)
else: else:
self.ip = cli_ip self.ip = cli_ip
@ -496,9 +494,7 @@ class HttpCli(object):
else ":".join(pip.split(":")[:4]) + ":" else ":".join(pip.split(":")[:4]) + ":"
) + "0.0/16" ) + "0.0/16"
zs2 = ( zs2 = (
' or "--xff-src=lan"' ' or "--xff-src=lan"' if self.conn.xff_lan.map(pip) else ""
if self.conn.hsrv.xff_lan.map(pip)
else ""
) )
self.log(t % (pip, idp_usr, idp_grp, zs, zs2), 3) self.log(t % (pip, idp_usr, idp_grp, zs, zs2), 3)

5
copyparty/httpconn.py
View file

@ -55,8 +55,9 @@ class HttpConn(object):
self.E: EnvParams = self.args.E self.E: EnvParams = self.args.E
self.asrv: AuthSrv = hsrv.asrv # mypy404 self.asrv: AuthSrv = hsrv.asrv # mypy404
self.u2fh: Util.FHC = hsrv.u2fh # mypy404 self.u2fh: Util.FHC = hsrv.u2fh # mypy404
self.ipa_nm: NetMap = hsrv.ipa_nm self.ipa_nm: Optional[NetMap] = hsrv.ipa_nm
self.xff_nm: NetMap = hsrv.xff_nm self.xff_nm: Optional[NetMap] = hsrv.xff_nm
self.xff_lan: NetMap = hsrv.xff_lan # type: ignore
self.iphash: HMaccas = hsrv.broker.iphash self.iphash: HMaccas = hsrv.broker.iphash
self.bans: dict[str, int] = hsrv.bans self.bans: dict[str, int] = hsrv.bans
self.aclose: dict[str, int] = hsrv.aclose self.aclose: dict[str, int] = hsrv.aclose

2
copyparty/httpsrv.py
View file

@ -104,7 +104,7 @@ class HttpSrv(object):
self.t0 = time.time() self.t0 = time.time()
nsuf = "-n{}-i{:x}".format(nid, os.getpid()) if nid else "" nsuf = "-n{}-i{:x}".format(nid, os.getpid()) if nid else ""
self.magician = Magician() self.magician = Magician()
self.nm = NetMap([], {}) self.nm = NetMap([], [])
self.ssdp: Optional["SSDPr"] = None self.ssdp: Optional["SSDPr"] = None
self.gpwd = Garda(self.args.ban_pw) self.gpwd = Garda(self.args.ban_pw)
self.g404 = Garda(self.args.ban_404) self.g404 = Garda(self.args.ban_404)

2
copyparty/tftpd.py
View file

@ -97,8 +97,6 @@ class Tftpd(object):
cbak = [] cbak = []
if not self.args.tftp_no_fast and not EXE: if not self.args.tftp_no_fast and not EXE:
try: try:
import inspect
ptn = re.compile(r"(^\s*)log\.debug\(.*\)$") ptn = re.compile(r"(^\s*)log\.debug\(.*\)$")
for C in Cs: for C in Cs:
cbak.append(C.__dict__) cbak.append(C.__dict__)

2
tests/util.py
View file

@ -110,7 +110,7 @@ class Cfg(Namespace):
def __init__(self, a=None, v=None, c=None, **ka0): def __init__(self, a=None, v=None, c=None, **ka0):
ka = {} ka = {}
ex = "daw dav_auth dav_inf dav_mac dav_rt e2d e2ds e2dsa e2t e2ts e2tsr e2v e2vu e2vp ed emp exp force_js getmod grid hardlink ih ihead magic never_symlink nid nih no_acode no_athumb no_dav no_dedup no_del no_dupe no_lifetime no_logues no_mv no_readme no_robots no_sb_md no_sb_lg no_scandir no_tarcmp no_thumb no_vthumb no_zip nrand nw q rand smb srch_dbg stats vague_403 vc ver xdev xlink xvol" ex = "daw dav_auth dav_inf dav_mac dav_rt e2d e2ds e2dsa e2t e2ts e2tsr e2v e2vu e2vp early_ban ed emp exp force_js getmod grid hardlink ih ihead magic never_symlink nid nih no_acode no_athumb no_dav no_dedup no_del no_dupe no_lifetime no_logues no_mv no_readme no_robots no_sb_md no_sb_lg no_scandir no_tarcmp no_thumb no_vthumb no_zip nrand nw q rand smb srch_dbg stats vague_403 vc ver xdev xlink xvol"
ka.update(**{k: False for k in ex.split()}) ka.update(**{k: False for k in ex.split()})
ex = "dotpart dotsrch no_dhash no_fastboot no_rescan no_sendfile no_voldump re_dhash plain_ip" ex = "dotpart dotsrch no_dhash no_fastboot no_rescan no_sendfile no_voldump re_dhash plain_ip"