#Reformat setup file

stanislav-web · Jun 14, 2017 · b0ba8c8 · b0ba8c8
1 parent c91c5e7
commit b0ba8c8
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 146 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 .idea/
 /tmp/
-/syslog/
 /build/
 .coverage
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,4 +2,6 @@
 include data/*.dat
 include setup.cfg
 include opendoor.py
-include opendoor.conf
+include opendoor.conf
+include syslog/
+include tmp/
diff --git a/setup.cfg b/setup.cfg
diff --git a/setup.py b/setup.py
diff --git a/src/core/__init__.py b/src/core/__init__.py
@@ -18,6 +18,9 @@
 
 # noinspection PyPep8Naming
 from .color import Color as colour
+# noinspection PyPep8Naming
+from .core import CoreConfig as core
+# noinspection PyPep8Naming
 from .decorators import execution_time
 # noinspection PyPep8Naming
 from .filesystem import FileSystem as filesystem

diff --git a/src/core/core.py b/src/core/core.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+
+"""
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+    Development Team: Stanislav WEB
+"""
+
+CoreConfig = {
+    'info': {
+        'name': 'Opendoor scanner',
+        'repository': 'git@github.com:stanislav-web/OpenDoor.git',
+        'setup': 'https://raw.githubusercontent.com/stanislav-web/OpenDoor/master/setup.cfg',
+        'license': 'License: GNU General Public License',
+        'version': '3.3.36-rc',
+    },
+    'opendoor': {
+        'directories': 'data/directories.dat',
+        'ignored': 'data/ignored.dat',
+        'proxies': 'data/proxies.dat',
+        'subdomains': 'data/subdomains.dat',
+        'useragents': 'data/useragents.dat',
+        'tmplist': 'tmp/list.tmp',
+        'extensionlist': 'tmp/extensionlist.tmp',
+        'reports': 'reports/',
+    },
+    'system': {
+        'exceptions_log': 'syslog/exceptions.log',
+    }
+}
diff --git a/src/core/filesystem/filesystem.py b/src/core/filesystem/filesystem.py
@@ -252,7 +252,6 @@ def readcfg(filename):
         :return: configparser.RawConfigParser
         """
 
-        #TODO : Win32/64 check this ^(([(\/|\)a-z].*?opendoor.*?)(\/|\\))
         expression = '^([\/a-z].*?opendoor.*?)\/'
         find_dir = re.search(expression, __file__, re.IGNORECASE)
         if None is not find_dir:

diff --git a/src/core/logger/config.py b/src/core/logger/config.py
@@ -19,6 +19,7 @@
 import os
 
 from src.core import filesystem
+from src.core import core
 
 
 def exception_log():
@@ -27,8 +28,8 @@ def exception_log():
     :return: string
     """
 
-    config = filesystem.readcfg('setup.cfg')
-    return filesystem.getabsname(config.get('system', 'exceptions_log'))
+    exception_log = core.get('system').get('exceptions_log')
+    return filesystem.getabsname(exception_log)
 
 
 class Config(object):

diff --git a/src/lib/__init__.py b/src/lib/__init__.py
@@ -30,3 +30,4 @@
 from .reporter import Reporter as reporter, ReporterError
 # noinspection PyPep8Naming
 from .tpl import Tpl as tpl, TplError
+
diff --git a/syslog/.gitignore b/syslog/.gitignore
@@ -0,0 +1 @@
+!.gitignore
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,3 +30,4 @@
		from .reporter import Reporter as reporter, ReporterError
		# noinspection PyPep8Naming
		from .tpl import Tpl as tpl, TplError