User: Strip empty new lines before parsing CSV (#3895)

This commit is contained in:
Samantaz Fox 2023-06-12 21:09:39 +02:00
commit e6f5fcbc4b
No known key found for this signature in database
GPG Key ID: F42821059186176E

View File

@ -6,7 +6,7 @@ struct Invidious::User
# Parse a youtube CSV subscription file # Parse a youtube CSV subscription file
def parse_subscription_export_csv(csv_content : String) def parse_subscription_export_csv(csv_content : String)
rows = CSV.new(csv_content, headers: true) rows = CSV.new(csv_content.strip('\n'), headers: true)
subscriptions = Array(String).new subscriptions = Array(String).new
# Counter to limit the amount of imports. # Counter to limit the amount of imports.
@ -32,10 +32,10 @@ struct Invidious::User
def parse_playlist_export_csv(user : User, raw_input : String) def parse_playlist_export_csv(user : User, raw_input : String)
# Split the input into head and body content # Split the input into head and body content
raw_head, raw_body = raw_input.split("\n\n", limit: 2, remove_empty: true) raw_head, raw_body = raw_input.strip('\n').split("\n\n", limit: 2, remove_empty: true)
# Create the playlist from the head content # Create the playlist from the head content
csv_head = CSV.new(raw_head, headers: true) csv_head = CSV.new(raw_head.strip('\n'), headers: true)
csv_head.next csv_head.next
title = csv_head[4] title = csv_head[4]
description = csv_head[5] description = csv_head[5]
@ -51,7 +51,7 @@ struct Invidious::User
Invidious::Database::Playlists.update_description(playlist.id, description) Invidious::Database::Playlists.update_description(playlist.id, description)
# Add each video to the playlist from the body content # Add each video to the playlist from the body content
csv_body = CSV.new(raw_body, headers: true) csv_body = CSV.new(raw_body.strip('\n'), headers: true)
csv_body.each do |row| csv_body.each do |row|
video_id = row[0] video_id = row[0]
if playlist if playlist