Merge 77de46f316 into 4782a67038

src/invidious/user/imports.cr

@@ -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::Memory.new(body), true) do |file|
-
+        entry = file.entries.find { |file_entry| file_entry.filename == "newpipe.db" }
-      Compress::Zip::File.open(io) do |file|
+        return false if entry.nil?
-        file.entries.each do |entry|
         entry.open do |file_io|
           # Ensure max size of 4MB
           io_sized = IO::Sized.new(file_io, 0x400000)
 
-            next if entry.filename != "newpipe.db"
+          begin
-
+            temp = File.tempfile(".db") do |tempfile|
-            tempfile = File.tempfile(".db")
-
               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,10 @@ struct Invidious::User
                 user.subscriptions = get_batch_channels(user.subscriptions)
 
                 Invidious::Database::Users.update_subscriptions(user)
-
+              end
-            db.close
+            end
-            tempfile.delete
+          ensure
+            temp.delete if !temp.nil?
           end
         end
       end