瀏覽代碼

new version of capyt

raylu 9 年之前
父節點
當前提交
2369c9c76d
共有 1 個文件被更改,包括 17 次插入10 次删除
  1. 17 10
      capyt

+ 17 - 10
capyt

@@ -13,7 +13,7 @@ parser.add_argument('-d', '--delete', help="Delete paste with supplied delete to
 parser.add_argument('-b', '--burn', type=int, help="Maximum number of paste views before deletion")
 parser.add_argument('-l', '--lexer', help="Lexer to use (pygments get_lexer_by_name)", default="auto")
 parser.add_argument('-t', '--ttl', type=float, help="Time in hours before paste expires", default=1.0)
-parser.add_argument('-r', '--raw', help="Weather to have pastebin return raw or html paste url", default='true')
+parser.add_argument('-r', '--raw', help="Weather to have pastebin return raw or html paste url", default='false')
 parser.add_argument('-e', '--encoding', help="Define file encoding for given file (default: utf-8)")
 
 parser.add_argument('FILE', help="Files to upload", nargs="+") #Re-used as paste ID or URL when deleting
@@ -41,18 +41,25 @@ if args['delete']:
 		url = url + paste[2]
 	
 	print("DELETE ", url)
-	r = requests.delete(url, data={"token": args['delete']})
-	print(r.text)
-	if r.status_code != 200:
-		exit(1)
-
+	try:
+		r = requests.delete(url, data={"token": args['delete']})
+		print(r.text)
+		if r.status_code != 200:
+			exit(1)
+	except requests.ConnectionError:
+		print("Connection to host failed")
+		exit(2)
 else:
 	parameters = copy.deepcopy(args)
 	del parameters['FILE']
 
 	with fileinput.input(files=args['FILE'], openhook=hook_compressed_encoded(args['encoding'])) as f:
 		parameters['paste'] = ''.join(f)
-		r = requests.post(url, data=parameters)
-		print(r.text)
-		if r.status_code != 200:
-			exit(1)
+		try:
+			r = requests.post(url, data=parameters)
+			print(r.text)
+			if r.status_code != 200:
+				exit(1)
+		except requests.ConnectionError:
+			print("Connection to host failed")
+			exit(2)