improved import algorithm, fixed a referer issue from the playlists page after deleting a playlist
Signed-off-by: thtmnisamnstr <gavinj1984@gmail.com>
This commit is contained in:
parent
6f01d6eacf
commit
b3eea6ab3e
|
@ -30,18 +30,22 @@ struct Invidious::User
|
|||
return subscriptions
|
||||
end
|
||||
|
||||
def parse_playlist_export_csv(user : User, csv_content : String)
|
||||
rows = CSV.new(csv_content, headers: true)
|
||||
row_counter = 0
|
||||
def parse_playlist_export_csv(user : User, raw_input : String)
|
||||
playlist = uninitialized InvidiousPlaylist
|
||||
title = uninitialized String
|
||||
description = uninitialized String
|
||||
visibility = uninitialized String
|
||||
rows.each do |row|
|
||||
if row_counter == 0
|
||||
title = row[4]
|
||||
description = row[5]
|
||||
visibility = row[6]
|
||||
privacy = uninitialized PlaylistPrivacy
|
||||
|
||||
# Split the input into head and body content
|
||||
raw_head, raw_body = raw_input.split("\n\n", limit: 2, remove_empty: true)
|
||||
|
||||
# Create the playlist from the head content
|
||||
csv_head = CSV.new(raw_head, headers: true)
|
||||
csv_head.next
|
||||
title = csv_head[4]
|
||||
description = csv_head[5]
|
||||
visibility = csv_head[6]
|
||||
|
||||
if visibility.compare("Public", case_insensitive: true) == 0
|
||||
privacy = PlaylistPrivacy::Public
|
||||
|
@ -57,16 +61,13 @@ struct Invidious::User
|
|||
Invidious::Database::Playlists.update_description(playlist.id, description)
|
||||
end
|
||||
|
||||
row_counter += 1
|
||||
end
|
||||
if row_counter > 0 && row_counter < 3
|
||||
row_counter += 1
|
||||
end
|
||||
if row_counter >= 3
|
||||
if playlist
|
||||
# Add each video to the playlist from the body content
|
||||
CSV.each_row(raw_body) do |row|
|
||||
if row.size >= 1
|
||||
video_id = row[0]
|
||||
row_counter += 1
|
||||
if playlist
|
||||
next if !video_id
|
||||
next if video_id == "Video Id"
|
||||
|
||||
begin
|
||||
video = get_video(video_id)
|
||||
|
|
|
@ -10,12 +10,12 @@
|
|||
</div>
|
||||
<div class="pure-u-1-3">
|
||||
<h3 style="text-align:center">
|
||||
<a href="/create_playlist?referer=<%= URI.encode_www_form(referer) %>"><%= translate(locale, "Create playlist") %></a>
|
||||
<a href="/create_playlist?referer=<%= URI.encode_www_form("/feed/playlists") %>"><%= translate(locale, "Create playlist") %></a>
|
||||
</h3>
|
||||
</div>
|
||||
<div class="pure-u-1-3">
|
||||
<h3 style="text-align:right">
|
||||
<a href="/data_control?referer=<%= URI.encode_www_form(referer) %>">
|
||||
<a href="/data_control?referer=<%= URI.encode_www_form("/feed/playlists") %>">
|
||||
<%= translate(locale, "Import/export") %>
|
||||
</a>
|
||||
</h3>
|
||||
|
|
Loading…
Reference in a new issue