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:
thtmnisamnstr 2023-02-23 15:55:38 -08:00
parent 6f01d6eacf
commit b3eea6ab3e
2 changed files with 30 additions and 29 deletions

View File

@ -30,18 +30,22 @@ struct Invidious::User
return subscriptions return subscriptions
end end
def parse_playlist_export_csv(user : User, csv_content : String) def parse_playlist_export_csv(user : User, raw_input : String)
rows = CSV.new(csv_content, headers: true)
row_counter = 0
playlist = uninitialized InvidiousPlaylist playlist = uninitialized InvidiousPlaylist
title = uninitialized String title = uninitialized String
description = uninitialized String description = uninitialized String
visibility = uninitialized String visibility = uninitialized String
rows.each do |row| privacy = uninitialized PlaylistPrivacy
if row_counter == 0
title = row[4] # Split the input into head and body content
description = row[5] raw_head, raw_body = raw_input.split("\n\n", limit: 2, remove_empty: true)
visibility = row[6]
# 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 if visibility.compare("Public", case_insensitive: true) == 0
privacy = PlaylistPrivacy::Public privacy = PlaylistPrivacy::Public
@ -57,16 +61,13 @@ struct Invidious::User
Invidious::Database::Playlists.update_description(playlist.id, description) Invidious::Database::Playlists.update_description(playlist.id, description)
end end
row_counter += 1 # Add each video to the playlist from the body content
end CSV.each_row(raw_body) do |row|
if row_counter > 0 && row_counter < 3 if row.size >= 1
row_counter += 1
end
if row_counter >= 3
if playlist
video_id = row[0] video_id = row[0]
row_counter += 1 if playlist
next if !video_id next if !video_id
next if video_id == "Video Id"
begin begin
video = get_video(video_id) video = get_video(video_id)

View File

@ -10,12 +10,12 @@
</div> </div>
<div class="pure-u-1-3"> <div class="pure-u-1-3">
<h3 style="text-align:center"> <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> </h3>
</div> </div>
<div class="pure-u-1-3"> <div class="pure-u-1-3">
<h3 style="text-align:right"> <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") %> <%= translate(locale, "Import/export") %>
</a> </a>
</h3> </h3>