lib/twitterscraper/query.rb in twitterscraper-ruby-0.17.0 vs lib/twitterscraper/query.rb in twitterscraper-ruby-0.18.0
- old
+ new
@@ -74,13 +74,13 @@
[items_html, json_resp]
end
def query_single_page(query, lang, type, pos, headers: [], proxies: [])
logger.info "Querying #{query}"
- query = ERB::Util.url_encode(query)
+ encoded_query = ERB::Util.url_encode(query)
- url = build_query_url(query, lang, type, pos)
+ url = build_query_url(encoded_query, lang, type, pos)
http_request = lambda do
logger.debug "Scraping tweets from url=#{url}"
get_single_page(url, headers, proxies)
end
@@ -90,10 +90,14 @@
logger.debug "Fetching tweets from cache url=#{url}"
else
response = http_request.call
client.write(url, response) unless stop_requested?
end
+ if @queries && query == @queries.last && pos.nil?
+ logger.debug "Delete a cache query=#{query}"
+ client.delete(url)
+ end
else
response = http_request.call
end
return [], nil if response.nil? || response.empty?
@@ -168,10 +172,10 @@
time += 3600
break if time >= end_time
end
end
- queries
+ @queries = queries
elsif start_date
[query + " since:#{start_date}"]
elsif end_date
[query + " until:#{end_date}"]