Reorder code to give domain parameter preference over target

Fixes 1N3#20
tdebatty · Oct 27, 2019 · 5e22e7d · 5e22e7d
1 parent a3c6f83
commit 5e22e7d
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/blackwidow b/blackwidow
@@ -267,23 +267,24 @@ else:
   ans = scan
   level = 1
 
-  #using a domain and a port or a URL?
+  # using a domain and a port or a URL?
   if ":" not in target:
 
-    if (len(str(domain)) > 4):
+    if len(str(target)) > 6:
+      url = target + ":" + port #big change here
+      #print "url is: " + url
+    else:
+      url = "http://" + str(domain) + ":" + port
+      #print "url is: " + url
+
+    if len(str(domain)) > 4:
       target = "http://" + domain + ":" + port
       #print "target is: " + target
     else:
       parsed_uri = urlparse(target)
       domain = '{uri.netloc}'.format(uri=parsed_uri)
       #print "domain after parsed_uri is now: " + domain
 
-    if (len(str(target)) > 6):
-      url = target + ":" + port #big change here
-      #print "url is: " + url
-    else:
-      url = "http://" + str(domain) + ":" + port
-      #print "url is: " + url
   else:
       url = target
       globalURL = target