Commit5abd758

authored

Merge pull request#2106 from ppfeister/bugfix/skip-filter-2103

Skip content filter for explicitly chosen targets

2 parentsf6bb608 +d85c073 commit5abd758Copy full SHA for 5abd758

File tree

-5

lines changed

-5

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -575,7 +575,7 @@ def main():`
`575`	`575`	`action="append",`
`576`	`576`	`metavar="SITE_NAME",`
`577`	`577`	`dest="site_list",`
`578`		`-default=None,`
	`578`	`+default=[],`
`579`	`579`	`help="Limit analysis to just the listed sites. Add multiple options to specify more than one site.",`
`580`	`580`	`)`
`581`	`581`	`parser.add_argument(`
`@@ -725,13 +725,13 @@ def main():`
`725`	`725`	`sys.exit(1)`
`726`	`726`
`727`	`727`	`ifnotargs.nsfw:`
`728`		`-sites.remove_nsfw_sites()`
	`728`	`+sites.remove_nsfw_sites(do_not_remove=args.site_list)`
`729`	`729`
`730`	`730`	`# Create original dictionary from SitesInformation() object.`
`731`	`731`	`# Eventually, the rest of the code will be updated to use the new object`
`732`	`732`	`# directly, but this will glue the two pieces together.`
`733`	`733`	`site_data_all= {site.name:site.informationforsiteinsites}`
`734`		`-ifargs.site_listisNone:`
	`734`	`+ifargs.site_list== []:`
`735`	`735`	`# Not desired to look at a sub-set of sites`
`736`	`736`	`site_data=site_data_all`
`737`	`737`	`else:`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ def __init__(self, data_file_path=None):`
`179`	`179`
`180`	`180`	`return`
`181`	`181`
`182`		`-defremove_nsfw_sites(self):`
	`182`	`+defremove_nsfw_sites(self,do_not_remove:list= []):`
`183`	`183`	`"""`
`184`	`184`	`Remove NSFW sites from the sites, if isNSFW flag is true for site`
`185`	`185`
`@@ -190,8 +190,9 @@ def remove_nsfw_sites(self):`
`190`	`190`	`None`
`191`	`191`	`"""`
`192`	`192`	`sites= {}`
	`193`	`+do_not_remove= [site.casefold()forsiteindo_not_remove]`
`193`	`194`	`forsiteinself.sites:`
`194`		`-ifself.sites[site].is_nsfw:`
	`195`	`+ifself.sites[site].is_nsfwandsite.casefold()notindo_not_remove:`
`195`	`196`	`continue`
`196`	`197`	`sites[site]=self.sites[site]`
`197`	`198`	`self.sites=sites`

Comments

(0)