mirror of https://github.com/iv-org/invidious.git
Ensure IO is properly closed when importing NewPipe subscriptions
This commit is contained in:
parent
c5fdd9ea65
commit
a0bb4b32c6
|
@ -290,26 +290,22 @@ struct Invidious::User
|
|||
end
|
||||
|
||||
def from_newpipe(user : User, body : String) : Bool
|
||||
io = IO::Memory.new(body)
|
||||
|
||||
Compress::Zip::File.open(io) do |file|
|
||||
Compress::Zip::File.open(IO::Memory.new(body), true) do |file|
|
||||
file.entries.each do |entry|
|
||||
entry.open do |file_io|
|
||||
next if entry.filename != "newpipe.db"
|
||||
|
||||
# Ensure max size of 4MB
|
||||
io_sized = IO::Sized.new(file_io, 0x400000)
|
||||
|
||||
next if entry.filename != "newpipe.db"
|
||||
|
||||
tempfile = File.tempfile(".db")
|
||||
|
||||
temp = File.tempfile(".db") do |tempfile|
|
||||
begin
|
||||
File.write(tempfile.path, io_sized.gets_to_end)
|
||||
rescue
|
||||
return false
|
||||
end
|
||||
|
||||
db = DB.open("sqlite3://" + tempfile.path)
|
||||
|
||||
DB.open("sqlite3://" + tempfile.path) do |db|
|
||||
user.watched += db.query_all("SELECT url FROM streams", as: String)
|
||||
.map(&.lchop("https://www.youtube.com/watch?v="))
|
||||
|
||||
|
@ -323,9 +319,9 @@ struct Invidious::User
|
|||
user.subscriptions = get_batch_channels(user.subscriptions)
|
||||
|
||||
Invidious::Database::Users.update_subscriptions(user)
|
||||
|
||||
db.close
|
||||
tempfile.delete
|
||||
end
|
||||
end
|
||||
temp.delete
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue