Update Records.json importing script

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.5.3] — 2024-06-10
+
+### Fixed
+
+- Reworked code responsible for importing "Records.json" file from Google Takeout. Now it is more reliable and faster, and should not throw as many errors as before.
+
+---
 ## [0.5.2] — 2024-06-08
 
 ### Added

README.md

@@ -1,5 +1,13 @@
 # Dawarich
 
+## Screenshots
+
+![Map](screenshots/map.jpeg)
+
+![Stats](screenshots/stats.jpeg)
+
+![Import](screenshots/imports.jpeg)
+
 [Discord](https://discord.gg/pHsBjpt5J8) | [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/H2H3IDYDD)
 
 Dawarich is a self-hosted web application to replace Google Timeline (aka Google Location History). It allows you to import your location history from Google Maps Timeline and Owntracks, view it on a map and see some statistics, such as the number of countries and cities visited, and distance traveled.
@@ -75,14 +83,6 @@ Copy the contents of the `docker-compose.yml` file to your server and run `docke
 | BACKGROUND_PROCESSING_CONCURRENCY (only for dawarich_sidekiq service)  | Number of simultaneously processed background jobs, default is 10  |
 
 
-## Screenshots
-
-![Map](screenshots/map.jpeg)
-
-![Stats](screenshots/stats.jpeg)
-
-![Import](screenshots/imports.jpeg)
-
 ## Star History
 
 As you could probably guess, I like statistics.

app/services/google_maps/records_parser.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'redis_client'
 class GoogleMaps::RecordsParser
   attr_reader :import
 
@@ -11,6 +10,8 @@ class GoogleMaps::RecordsParser
   def call(json)
     data = parse_json(json)
 
+    return if Point.exists?(latitude: data[:latitude], longitude: data[:longitude], timestamp: data[:timestamp])
+
     Point.create(
       latitude: data[:latitude],
       longitude: data[:longitude],
@@ -30,6 +31,8 @@ class GoogleMaps::RecordsParser
       latitude: json['latitudeE7'].to_f / 10**7,
       longitude: json['longitudeE7'].to_f / 10**7,
       timestamp: DateTime.parse(json['timestamp']).to_i,
+      altitude: json['altitude'],
+      velocity: json['velocity'],
       raw_data: json
     }
   end

app/services/stream_handler.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require 'oj'
-
-class StreamHandler < Oj::ScHandler
-  attr_reader :import_id
-
-  def initialize(import_id)
-    @import_id = import_id
-    @buffer = {}
-  end
-
-  def hash_start
-    {}
-  end
-
-  def hash_end
-    ImportGoogleTakeoutJob.perform_later(import_id, @buffer.to_json)
-
-    @buffer = {}
-  end
-
-  def hash_set(_buffer, key, value)
-    @buffer[key] = value
-  end
-end

config/initializers/sidekiq.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Sidekiq.configure_server do |config|
   config.redis = { url: ENV['REDIS_URL'] }
 end

config/sidekiq.yml

@@ -1,5 +1,5 @@
 ---
-:concurrency: <%= ENV.fetch("BACKGROUND_PROCESSING_CONCURRENCY", 10) %>
+:concurrency: <%= ENV.fetch("BACKGROUND_PROCESSING_CONCURRENCY", 100) %>
 :queues:
   - default
   - imports

lib/tasks/import.rake

@@ -11,15 +11,17 @@ namespace :import do
     raise 'User not found' unless user
 
     import = user.imports.create(name: args[:file_path], source: :google_records)
-
-    handler = StreamHandler.new(import.id)
+    import_id = import.id
 
     pp "Importing #{args[:file_path]} for #{user.email}, file size is #{File.size(args[:file_path])}... This might take a while, have patience!"
 
-    File.open(args[:file_path], 'r') do |content|
-      Oj.sc_parse(handler, content)
+    content = File.read(args[:file_path]); nil
+    data = Oj.load(content); nil
+
+    data['locations'].each do |json|
+      ImportGoogleTakeoutJob.perform_later(import_id, json.to_json)
     end
 
-    pp "Imported #{args[:file_path]} for #{user.email} successfully!"
+    pp "Imported #{args[:file_path]} for #{user.email} successfully! Wait for the processing to finish. You can check the status of the import in the Sidekiq UI (http://<your-dawarich-url>/sidekiq)."
   end
 end