spiderfoot: move dicts to spiderfoot/dicts/ (smicallef#1209)

mepowerleo10 · Jun 27, 2021 · 41e0545 · 41e0545
1 parent 550733f
commit 41e0545
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 4 deletions.
diff --git a/modules/sfp_dnsbrute.py b/modules/sfp_dnsbrute.py
@@ -64,17 +64,18 @@ def setup(self, sfc, userOpts=dict()):
         for opt in list(userOpts.keys()):
             self.opts[opt] = userOpts[opt]
 
+        dicts_dir = f"{self.sf.myPath()}/spiderfoot/dicts/"
         cslines = list()
         if self.opts['commons']:
-            cs = open(self.sf.myPath() + "/dicts/subdomains.txt", 'r')
+            cs = open(f"{dicts_dir}/subdomains.txt", 'r')
             cslines = cs.readlines()
             for s in cslines:
                 s = s.strip()
                 self.sublist[s] = True
 
         ttlines = list()
         if self.opts['top10000']:
-            tt = open(self.sf.myPath() + "/dicts/subdomains-10000.txt", 'r')
+            tt = open(f"{dicts_dir}/subdomains-10000.txt", 'r')
             ttlines = tt.readlines()
             for s in ttlines:
                 s = s.strip()

diff --git a/sflib.py b/sflib.py
@@ -1160,7 +1160,7 @@ def dictwords(self):
 
         for d in dicts:
             try:
-                with io.open(self.myPath() + "/dicts/ispell/" + d + ".dict", 'r', encoding='utf8', errors='ignore') as wdct:
+                with io.open(f"{self.myPath()}/spiderfoot/dicts/ispell/{d}.dict", 'r', encoding='utf8', errors='ignore') as wdct:
                     dlines = wdct.readlines()
             except BaseException as e:
                 self.debug(f"Could not read dictionary: {e}")
@@ -1185,7 +1185,7 @@ def dictnames(self):
 
         for d in dicts:
             try:
-                wdct = open(self.myPath() + "/dicts/ispell/" + d + ".dict", 'r')
+                wdct = open(f"{self.myPath()}/spiderfoot/dicts/ispell/{d}.dict", 'r')
                 dlines = wdct.readlines()
                 wdct.close()
             except BaseException as e:

diff --git a/spiderfoot/dicts/__init__.py b/spiderfoot/dicts/__init__.py
diff --git a/dicts/ispell/LICENSE → spiderfoot/dicts/ispell/LICENSE b/dicts/ispell/LICENSE → spiderfoot/dicts/ispell/LICENSE
diff --git a/spiderfoot/dicts/ispell/__init__.py b/spiderfoot/dicts/ispell/__init__.py
diff --git a/dicts/ispell/english.dict → spiderfoot/dicts/ispell/english.dict b/dicts/ispell/english.dict → spiderfoot/dicts/ispell/english.dict
diff --git a/dicts/ispell/french.dict → spiderfoot/dicts/ispell/french.dict b/dicts/ispell/french.dict → spiderfoot/dicts/ispell/french.dict
diff --git a/dicts/ispell/german.dict → spiderfoot/dicts/ispell/german.dict b/dicts/ispell/german.dict → spiderfoot/dicts/ispell/german.dict
diff --git a/dicts/ispell/names.dict → spiderfoot/dicts/ispell/names.dict b/dicts/ispell/names.dict → spiderfoot/dicts/ispell/names.dict
diff --git a/dicts/ispell/spanish.dict → spiderfoot/dicts/ispell/spanish.dict b/dicts/ispell/spanish.dict → spiderfoot/dicts/ispell/spanish.dict
diff --git a/dicts/subdomains-10000.txt → spiderfoot/dicts/subdomains-10000.txt b/dicts/subdomains-10000.txt → spiderfoot/dicts/subdomains-10000.txt
diff --git a/dicts/subdomains.txt → spiderfoot/dicts/subdomains.txt b/dicts/subdomains.txt → spiderfoot/dicts/subdomains.txt