代码优化

ChangeLog.txt

@@ -1,5 +1,8 @@
 updateHosts ChangeLog 
 ==============
+1.2.0 2014/11/4
+可以删除hosts文件中127.0.0.1屏蔽网站的记录
+
 1.1.3 2014/10/28
 代码优化
 

README.md

@@ -32,7 +32,7 @@ updateHosts
 - **（已完成）**可选的hosts更新源
 - **（已完成）**运行时不显示窗口
 - **（已完成）**打包成exe文件，无需安装python即可使用
-- **（暂时关闭）**可去除AdBlock部分，默认启用
+- **（已去除）**可去除AdBlock部分
 - **（已完成）** 用户可自定义hosts内容
 - 待添加
 

config.ini

@@ -6,3 +6,7 @@ source1 = https://raw.githubusercontent.com/zxdrive/imouto.host/master/imouto.ho
 source2 = https://raw.githubusercontent.com/txthinking/google-hosts/master/hosts
 source3 = https://smarthosts.googlecode.com/svn/trunk/hosts
 source4 = https://simpleu.googlecode.com/svn/trunk/hosts
+
+[other]
+not_block_sites = 0
+#0为保持hosts文件不变，1为关闭hosts中通过127.0.0.1对网站的屏蔽

updateHosts.py

@@ -4,7 +4,7 @@
 #name:updateHosts
 #author:https://github.com/ladder1984
 #python version:2.7.8
-#version:1.1.3
+#version:1.2.0
 ############################
 
 from urllib import urlretrieve
@@ -15,16 +15,19 @@
 import ConfigParser
 
 #default setting
-hosts_source = "https://raw.githubusercontent.com/zxdrive/imouto.host/master/imouto.host.txt"
 hosts_folder = os.environ['SYSTEMROOT']+"\\System32\\drivers\\etc\\"
 hosts_location = hosts_folder + "hosts"
+
+hosts_source = "https://raw.githubusercontent.com/zxdrive/imouto.host/master/imouto.host.txt"
+not_block_sites = 0
 #default setting
 
 errorLog = open('errorLog.txt', 'a')
 
 
 def get_config():
     global hosts_source
+    global not_block_sites
     if os.path.exists('config.ini'):
         #清除Windows记事本自动添加的BOM
         content = open('config.ini').read()
@@ -37,6 +40,7 @@ def get_config():
         config.read('config.ini')
         source_id = config.get('source_select', 'source_id')
         hosts_source = config.get('source_select', 'source'+source_id)
+        not_block_sites = config.get("other", "not_block_sites")
 
 
 def backup_hosts():
@@ -58,12 +62,16 @@ def process_hosts():
     hosts_content = open('hosts','w')
     file_from_web = open('hosts_from_web')
     hosts_from_web = file_from_web.read()
-    file_user_defined=open('hosts_user_defined.txt')
-    hosts_user_defined=file_user_defined.read()
+    file_user_defined = open('hosts_user_defined.txt')
+    hosts_user_defined = file_user_defined.read()
+    hosts_content.write("127.0.0.1	localhost\n")
+    hosts_content.write("::1	localhost\n\n")
     hosts_content.write('#hosts_user_defined\n')
     hosts_content.write(hosts_user_defined)
     hosts_content.write('\n#hosts_user_defined\n')
     hosts_content.write('\n\n#hosts_by_hostsUpdate\n\n')
+    if not_block_sites is "1":
+        hosts_from_web = re.sub("127.0.0.1", "#not_block_sites", hosts_from_web)
     hosts_content.write(hosts_from_web)
     hosts_content.write('\n#hosts_by_hostsUpdate')
     hosts_content.close()