diff --git a/ppf.py b/ppf.py index 65ada92..cbe6c5c 100755 --- a/ppf.py +++ b/ppf.py @@ -41,43 +41,6 @@ def is_good_content_type(string): if ct.lower() in string.lower(): return True return False -def proxyleech(proxydb, urldb, url, stale_count, error, retrievals, proxies_added, content_type, proxy): - if not content_type: content_type = get_content_type(url, proxy=proxy) - - if is_good_content_type(content_type, proxy=proxy): - try: content = fetch.fetch_contents(url, proxy=proxy) - except KeyboardInterrupt as e: raise e - except: raise - #except: content = '' - else: - content = '' - - unique_count, new = fetch.extract_proxies(content, proxydb) - - if retrievals == 0: # new site - if content != '' and unique_count == 0: # site works but has zero proxy addresses - error = 99999 - else: - if len(new) == 0: - stale_count += 1 - else: - stale_count = 0 - if content == '': - error += 1 - else: - retrievals += 1 - error = 0 - if unique_count: - extract_urls(content, url) - - urldb.execute('UPDATE uris SET error=?,stale_count=?,check_time=?,retrievals=?,proxies_added=?,content_type=? where url=?', (error, stale_count, int(time.time()), retrievals, proxies_added+len(new), content_type, url)) - urldb.commit() - - if not len(new): return - - dbs.insert_proxies(proxydb, new, url) - - def is_bad_url(uri, domain=None, samedomain=False): # if uri needs to be from same domain and domains missmatch if samedomain and str(uri.split('/')[2]).lower() != str(domain).lower(): @@ -118,103 +81,16 @@ def import_proxies_from_file(proxydb, fn): return 0 return 1 -def serve_loop(hs, done): - client_threads = [] - while not done.is_set(): - c = hs.wait_client() - - evt_done = threading.Event() - cthread = threading.Thread(target=httpsrv_client_thread, args=(c,evt_done)) - cthread.daemon = True - cthread.start() - - ctrm = [] - for ct, ct_done in client_threads: - if ct_done.is_set(): - ctrm.append((ct,ct_done)) - ct.join() - - if len(ctrm): - client_threads = [ x for x in client_threads if not x in ctrm ] - - client_threads.append((cthread, evt_done)) - -def forbidden_page(): - return ( - '\n' - '
\n' - ' \n' - '