From 94bf4eeea04a132625001e3c96f85293e74d22a6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Sun, 7 Jun 2015 14:42:51 -0400 Subject: [PATCH] contrib: update users of Curl MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- contrib/benitlux/src/benitlux_daily.nit | 5 +---- contrib/rss_downloader/src/rss_downloader.nit | 15 ++++----------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/contrib/benitlux/src/benitlux_daily.nit b/contrib/benitlux/src/benitlux_daily.nit index bb6d1fa..1c1f4d6 100644 --- a/contrib/benitlux/src/benitlux_daily.nit +++ b/contrib/benitlux/src/benitlux_daily.nit @@ -129,14 +129,11 @@ class Benitlux # Fetch the Web page at `url` fun download_html_page: String do - var curl = new Curl - - var request = new CurlHTTPRequest(url, curl) + var request = new CurlHTTPRequest(url) var response = request.execute if response isa CurlResponseSuccess then var body = response.body_str - curl.destroy return body else if response isa CurlResponseFailed then print "Failed downloading URL '{url}' with: {response.error_msg} ({response.error_code})" diff --git a/contrib/rss_downloader/src/rss_downloader.nit b/contrib/rss_downloader/src/rss_downloader.nit index eacaf79..ed5fc72 100644 --- a/contrib/rss_downloader/src/rss_downloader.nit +++ b/contrib/rss_downloader/src/rss_downloader.nit @@ -62,16 +62,12 @@ class Element # Download this element to `path` fun download_to(path: Text) do - var curl = new Curl - - var request = new CurlHTTPRequest(link, curl) + var request = new CurlHTTPRequest(link) var response = request.download_to_file(path.to_s) - if response isa CurlFileResponseSuccess then - curl.destroy - else if response isa CurlResponseFailed then + if response isa CurlResponseFailed then sys.stderr.write "Failed downloading URL '{link}' with: {response.error_msg} ({response.error_code})\n" - else abort + end end # Get an unique identifier for this element, uses `Config::unique_pattern` @@ -232,16 +228,13 @@ redef class Text # Get the content of the RSS feed at `self` fun fetch_rss_content: Text do - var curl = new Curl - if sys.verbose then print "\n# Downloading RSS file from '{self}'" - var request = new CurlHTTPRequest(to_s, curl) + var request = new CurlHTTPRequest(to_s) var response = request.execute if response isa CurlResponseSuccess then var body = response.body_str - curl.destroy if sys.verbose then print "Download successful" return body else if response isa CurlResponseFailed then -- 1.7.9.5