更新curl工具类

zhanghe06 · zhanghe06 · commit 2fe9473f1c4d · 2015-11-05T11:15:19.000+08:00
diff --git a/tools/curl.py b/tools/curl.py
@@ -33,13 +33,27 @@ def post(url, data, with_user_agent=1):
     return response
 
 
-def get_head(url):
+def get_headers(url, header_key=None):
     """
     &#20165;&#20165;&#33719;&#21462;&#22836;&#37096;&#20449;&#24687;
     """
     cmd = 'curl -I %s' % url
-    response = os.popen(cmd).read()
-    return response
+    response = os.popen(cmd).read().strip()
+    header_list = response.split('\r\n')
+    print header_list[0]
+    headers = {}
+    for item in header_list:
+        header = item.split(': ')
+        if len(header) == 2:
+            if header[0] == 'Set-Cookie' and headers.get('Set-Cookie') is not None:
+                headers['Set-Cookie'] = ' | '.join([headers.get('Set-Cookie'), header[1].strip()])
+            else:
+                headers[header[0]] = header[1].strip()
+
+    if header_key is not None:
+        return headers.get(header_key, None)
+    else:
+        return headers
 
 
 def save_cookie(url):
@@ -61,5 +75,8 @@ def with_cookie(url):
 
 
 if __name__ == '__main__':
+    import json
     # print get('https://www.baidu.com/s?wd=python')
-    print post('http://www.wealink.com/passport/login', 'username=123456&password=123456')
+    # print post('http://www.wealink.com/passport/login', 'username=123456&password=123456')
+    # print get_headers('http://jump.zhineng.58.com/clk?target=mv7V0A-b5HThmvqfpv--5HTdmYw-w-ICXjF_E1KpuNG7EhnoEy0q5iubpgPGujYQrj01P19knWTQrjbvnHc1PjEYrHT3nWDdPj0h0vQfIjd_pgPYUARhIaubpgPYUHYQPjEvPWcLn19YnHndFMF-uWdCIZwkrBtf0v98PH98mvqVsvF6UhGGmith0vqd0hP-5HDhIh-1Iy-b5HThIh-1Iy-k5HDkni3zn1D8nH9dsWmvFhR8IZwk5HTh0A7zmyYqFh-1ug6YuyOb5yu6UZP-FMK_uWYVniuGUyRG5iudpyEqnWb3nHcQP1TQP1T1P1NhmvQopyEquynQrH--uWcVmHnkmBYYnhmLsyF-mymVuH0QnAcYrjK6nvPBFMKGujYQFhR8IA-b5HEYnWnzPHTYnjm3Pjn1PHDkPau-UMwY0jY1FMKzpyP-5HDYrHmh0hRbpgcqpZwY0jCfsLIfI1NzPi3drjN3shPfUiubpgPkULnqniu1IyFGujYQnH9vn1n3PzuW0hR6IARb5HDYPHNLn1ndnHT1rjTknaukmgF6Uy-b5iubpgPWmHYOPBu1uyQhmvDqrHmhuA-1UAtqnBu1uyQhUAtqnBuQ5HD8njD1nWTLPjbOrjnLn1TvPBukmyI-UMRV5HDhmh-b5HDdnjThIv-_uAP60hEqniu60ZK-Uhwoug-LULFb5HTh0hRWmyQ_uhQfI1YkFh7BIjYznjDdnjnQnRqCIy78uL--g17tnE&adact=3&psid=187378020189612344490821547&entinfo=442325040684335104_3&PGTID=187378020189612344490821547&ClickID=1&iuType=q_2')
+    print json.dumps(get_headers('http://www.baidu.com'), indent=4)
