Fixed detection for j1

Author: Andrey Oskin

docs/src/advanced.md

@@ -1,3 +1,7 @@
+```@meta
+Module = UrlDownload
+```
+
 # Additional functionality
 
 ## Progress Meter
@@ -164,9 +168,49 @@ x,y
 3,4
 ```
 
-You can process downloaded file with `urldownload` in the following way
+Since [`urldownload`](@ref) supports local files download, you can read data in the following way
+```julia
+res = urldownload("/tmp/data.csv") |> DataFrame
+```
+
+## Resource type autodetection
+
+As it was said in previous section, [`urldownload`](@ref) can autodetect resource type and download and process data accordingly. In case autodetection fails, you can always fallback to manual resource definition with the help of `File` and `URL` structs or `@f_str` and `@u_str` macros
+```julia
+using DataFrames
+using UrlDownload
+using UrlDownload: File, URL, @f_str, @u_str
+
+# All of these are equivalent
+url = "https://raw.githubusercontent.com/Arkoniak/UrlDownload.jl/master/data/ext.csv"
+res = urldownload(url) |> DataFrame
+
+url = u"https://raw.githubusercontent.com/Arkoniak/UrlDownload.jl/master/data/ext.csv"
+res = urldownload(url) |> DataFrame
+
+url = @u_str "https://raw.githubusercontent.com/Arkoniak/UrlDownload.jl/master/data/ext.csv"
+res = urldownload(url) |> DataFrame
+
+url = URL("https://raw.githubusercontent.com/Arkoniak/UrlDownload.jl/master/data/ext.csv")
+res = urldownload(url) |> DataFrame
+```
+
+and for the files
 ```julia
-io = open("/tmp/data.csv", "r")
-res = urldownload(io) |> DataFrame
-close(io)
+using DataFrames
+using UrlDownload
+using UrlDownload: File, URL, @f_str, @u_str
+
+# All of these are equivalent
+url = "/tmp/data.csv"
+res = urldownload(url) |> DataFrame
+
+url = f"/tmp/data.csv"
+res = urldownload(url) |> DataFrame
+
+url = @f_str "/tmp/data.csv"
+res = urldownload(url) |> DataFrame
+
+url = File("/tmp/data.csv")
+res = urldownload(url) |> DataFrame
 ```

src/UrlDownload.jl

@@ -44,7 +44,7 @@ struct URL <: Resource
 end
 
 """
-    macro f_str(name)
+    f_str(name)
 
 Use this macro to explicitly show that downloaded url is actually local file resource. It is useful if resource type autodetection fails.
 
@@ -67,7 +67,7 @@ macro f_str(p)
 end
 
 """
-    macro u_str(name)
+    u_str(name)
 
 Use this macro to explicitly show that downloaded url is remote http resource. It is useful if resource type autodetection fails.
 
@@ -255,10 +255,11 @@ end
 
 autodetect_uri_type(url) = url
 function autodetect_uri_type(url::AbstractString)
-    if startswith(url, r"https?://")
-        return URL(url)
-    else
+    m = match(r"^https?://.*", url)
+    if m === nothing
         return File(url)
+    else
+        return URL(url)
     end
 end