fix the issue of Lastfm keeps changing the date/count JSON data type …

…back and forth (string <-> integer); bump to 0.7.2

CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changelog
 
+## 0.7.2 (2019-02-25)
+
+* Fix the issue of Lastfm changing the date/count data type in JSON back and forth (string <-> integer).
+
 ## 0.7.1 (2019-01-14)
 
-* patches as per Lastfm API JSON data format changes: uts timestamp, play counts info are now returned as integers instead of strings.
+* Patches as per Lastfm API JSON data format changes: uts timestamp, play counts info are now returned as integers instead of strings.
 
 ## 0.7.0 (2019-01-11)
 

README.md

@@ -93,7 +93,7 @@ to your list of dependencies in `mix.exs`:
 ```elixir
   def deps do
     [
-      {:lastfm_archive, "~> 0.6.0"}
+      {:lastfm_archive, "~> 0.7.2"}
     ]
   end
 ```

lib/extract.ex

@@ -97,7 +97,14 @@ defmodule LastfmArchive.Extract do
   # find out more about the user (playcount, earliest scrobbles)
   # to determine data extraction strategy
   @doc false
-  def info(user) do
+  def info(user), do: _info(user) |> _format_info
+
+  # get playcount for a particular year for a user
+  @doc false
+  def info(user, {from, to}), do: _info(user, {from, to}) |> _format_info
+
+  # fetching user info
+  defp _info(user) do
     {_status, resp} = get_info(user)
 
     playcount = resp["user"]["playcount"]
@@ -107,8 +114,7 @@ defmodule LastfmArchive.Extract do
   end
 
   # get playcount for a particular year for a user
-  @doc false
-  def info(user, {from, to}) do
+  defp _info(user, {from, to}) do
     # pending, with a stop gap until Elixirfm pull requests are sorted out
     # this is so that `lastfm_archive` can be published on Hex now
     #{_status, resp} = get_recent_tracks(user, limit: 1, page: 1, from: from, to: to)
@@ -120,4 +126,19 @@ defmodule LastfmArchive.Extract do
     resp_body["recenttracks"]["@attr"]["total"]
   end
 
+  # Lastfm keeps changing the date/count JSON data type back and forth (from string to integer)
+  # use pattern matching to ensure the return date/count data is always in integer type
+
+  defp _format_info(playcount) when is_binary(playcount), do: playcount |> String.to_integer
+  defp _format_info(playcount) when is_integer(playcount), do: playcount
+
+  defp _format_info({playcount, registered}) when is_binary(playcount) or is_binary(registered) do
+    {playcount |> String.to_integer, registered |> String.to_integer}
+  end
+
+  defp _format_info({playcount, registered}) when is_integer(playcount) and is_integer(registered), do: {playcount, registered}
+
+  defp _format_info({nil, nil}), do: {0, 0}
+  defp _format_info(nil), do: 0
+
 end

lib/lastfm_archive.ex

@@ -359,7 +359,7 @@ defmodule LastfmArchive do
     per_page = option(options, :per_page)
     overwrite = option(options, :overwrite)
     daily = option(options, :daily)
-    
+
     padded_page_s = page |> to_string |> String.pad_leading(3, "0")
     filename = if daily do
       dt

mix.exs

@@ -8,7 +8,7 @@ defmodule LastfmArchive.MixProject do
   def project do
     [
       app: :lastfm_archive,
-      version: "0.7.1",
+      version: "0.7.2",
       elixir: "~> 1.7",
       start_permanent: Mix.env() == :prod,
       escript: [main_module: LastfmArchive.Cli, path: "bin/lastfm_archive"],