fix: Improved importing of duplicate posts and comments
All checks were successful
Build / build (push) Successful in 4m10s
All checks were successful
Build / build (push) Successful in 4m10s
This commit is contained in:
parent
d7bf17fa34
commit
65f8468daa
3 changed files with 64 additions and 40 deletions
|
@ -43,6 +43,15 @@ defmodule BdfrBrowser.Comment do
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def get_import(id) do
|
||||||
|
from(c in __MODULE__,
|
||||||
|
select: %{
|
||||||
|
id: c.id
|
||||||
|
},
|
||||||
|
where: c.id == ^id
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
def search(str), do: search(str, nil)
|
def search(str), do: search(str, nil)
|
||||||
|
|
||||||
def search(str, subreddits) when is_nil(subreddits) do
|
def search(str, subreddits) when is_nil(subreddits) do
|
||||||
|
|
|
@ -310,7 +310,9 @@ defmodule BdfrBrowser.Importer do
|
||||||
|
|
||||||
defp import_post(post, subreddit) when not is_nil(subreddit) do
|
defp import_post(post, subreddit) when not is_nil(subreddit) do
|
||||||
id = post["id"]
|
id = post["id"]
|
||||||
|
db_post = id |> Post.get_import() |> Repo.one()
|
||||||
|
|
||||||
|
if is_nil(db_post) do
|
||||||
%Post{
|
%Post{
|
||||||
id: id,
|
id: id,
|
||||||
title: post["title"],
|
title: post["title"],
|
||||||
|
@ -323,16 +325,18 @@ defmodule BdfrBrowser.Importer do
|
||||||
filename: Path.basename(post["filename"], ".json"),
|
filename: Path.basename(post["filename"], ".json"),
|
||||||
subreddit: subreddit
|
subreddit: subreddit
|
||||||
}
|
}
|
||||||
|> Repo.insert(
|
|> Repo.insert()
|
||||||
on_conflict: [set: [id: id]],
|
else
|
||||||
conflict_target: :id
|
{:ok, db_post}
|
||||||
)
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
defp import_comment(comment, post, parent) when not is_nil(post) do
|
defp import_comment(comment, post, parent) when not is_nil(post) do
|
||||||
id = comment["id"]
|
id = comment["id"]
|
||||||
|
db_comment = id |> Comment.get_import() |> Repo.one()
|
||||||
|
|
||||||
{:ok, parent} =
|
{:ok, parent} =
|
||||||
|
if is_nil(db_comment) do
|
||||||
%Comment{
|
%Comment{
|
||||||
id: id,
|
id: id,
|
||||||
author: comment["author"],
|
author: comment["author"],
|
||||||
|
@ -342,10 +346,10 @@ defmodule BdfrBrowser.Importer do
|
||||||
post: post,
|
post: post,
|
||||||
parent: parent
|
parent: parent
|
||||||
}
|
}
|
||||||
|> Repo.insert(
|
|> Repo.insert()
|
||||||
on_conflict: [set: [id: id]],
|
else
|
||||||
conflict_target: :id
|
{:ok, db_comment}
|
||||||
)
|
end
|
||||||
|
|
||||||
children = for child <- comment["replies"], do: import_comment(child, post, parent)
|
children = for child <- comment["replies"], do: import_comment(child, post, parent)
|
||||||
|
|
||||||
|
@ -370,8 +374,10 @@ defmodule BdfrBrowser.Importer do
|
||||||
id = calculate_message_id(message, chat.id)
|
id = calculate_message_id(message, chat.id)
|
||||||
message_content = message["content"]["Message"]
|
message_content = message["content"]["Message"]
|
||||||
{:ok, posted_at, 0} = DateTime.from_iso8601(message["timestamp"])
|
{:ok, posted_at, 0} = DateTime.from_iso8601(message["timestamp"])
|
||||||
|
db_message = Repo.get(Message, id)
|
||||||
|
|
||||||
{:ok, message_record} =
|
{:ok, message_record} =
|
||||||
|
if is_nil(db_message) do
|
||||||
%Message{
|
%Message{
|
||||||
id: id,
|
id: id,
|
||||||
author: message["author"],
|
author: message["author"],
|
||||||
|
@ -379,10 +385,10 @@ defmodule BdfrBrowser.Importer do
|
||||||
posted_at: posted_at,
|
posted_at: posted_at,
|
||||||
chat: chat
|
chat: chat
|
||||||
}
|
}
|
||||||
|> Repo.insert(
|
|> Repo.insert()
|
||||||
on_conflict: [set: [id: id]],
|
else
|
||||||
conflict_target: :id
|
{:ok, db_message}
|
||||||
)
|
end
|
||||||
|
|
||||||
existing_image =
|
existing_image =
|
||||||
message_record.message == "Image" or
|
message_record.message == "Image" or
|
||||||
|
|
|
@ -98,6 +98,15 @@ defmodule BdfrBrowser.Post do
|
||||||
having(query, [p, c, s], count(c.id) > ^more_than)
|
having(query, [p, c, s], count(c.id) > ^more_than)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def get_import(id) do
|
||||||
|
from(p in __MODULE__,
|
||||||
|
select: %{
|
||||||
|
id: p.id
|
||||||
|
},
|
||||||
|
where: p.id == ^id
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
def get_full(id) do
|
def get_full(id) do
|
||||||
from(p in __MODULE__,
|
from(p in __MODULE__,
|
||||||
where: p.id == ^id,
|
where: p.id == ^id,
|
||||||
|
|
Reference in a new issue