sergey/hosts
1
0
Fork 0
mirror of https://github.com/StevenBlack/hosts.git synced 2026-07-01 02:36:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

os.path.join introduced

Browse Source
This commit is contained in:
Zaur Molotnikov
2015-10-19 12:27:41 +02:00
parent 3e76274956
commit 7e8b1674fb
2 changed files with 17487 additions and 17487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34960
hosts
View File

File diff suppressed because it is too large Load Diff

14
updateHostsFile.py Normal file → Executable file
View File

@@ -19,12 +19,12 @@ import StringIO
# Project Settings
BASEDIR_PATH = os.path.dirname(os.path.realpath(__file__))
DATA_PATH = BASEDIR_PATH + '/data'
DATA_PATH = os.path.join(BASEDIR_PATH, 'data')
DATA_FILENAMES = 'hosts'
UPDATE_URL_FILENAME = 'update.info'
SOURCES = os.listdir(DATA_PATH)
README_TEMPLATE = BASEDIR_PATH + '/readme_template.md'
README_FILE = BASEDIR_PATH + '/readme.md'
README_TEMPLATE = os.path.join(BASEDIR_PATH, 'readme_template.md')
README_FILE = os.path.join(BASEDIR_PATH, 'readme.md')
TARGET_HOST = '0.0.0.0'
# Exclusions
@@ -131,12 +131,12 @@ def updateAllSources():
updatedFile = string.replace( updatedFile, '\r', '' ) #get rid of carriage-return symbols
dataFile = open(DATA_PATH + '/' + source + '/' + DATA_FILENAMES, 'w')
dataFile = open(os.path.join(DATA_PATH, source, DATA_FILENAMES), 'w')
dataFile.write(updatedFile)
dataFile.close()
def getUpdateURLFromFile(source):
pathToUpdateFile = DATA_PATH + '/' + source + '/' + UPDATE_URL_FILENAME
pathToUpdateFile = os.path.join(DATA_PATH, source, UPDATE_URL_FILENAME)
if os.path.exists(pathToUpdateFile):
updateFile = open(pathToUpdateFile, 'r')
retURL = updateFile.readline().strip()
@@ -152,7 +152,7 @@ def getUpdateURLFromFile(source):
def createInitialFile():
mergeFile = tempfile.NamedTemporaryFile()
for source in SOURCES:
curFile = open(DATA_PATH + '/' + source +'/' + DATA_FILENAMES, 'r')
curFile = open(os.path.join(DATA_PATH, source, DATA_FILENAMES), 'r')
mergeFile.write('\n# Begin ' + source + '\n')
mergeFile.write(curFile.read())
mergeFile.write('\n# End ' + source + '\n')
@@ -161,7 +161,7 @@ def createInitialFile():
def removeDups(mergeFile):
global numberOfRules
finalFile = open(BASEDIR_PATH + '/hosts', 'w+b')
finalFile = open(os.path.join(BASEDIR_PATH, 'hosts'), 'w+b')
mergeFile.seek(0) # reset file pointer
hostnames = set()