Fix up file deletion

src/Controller/PostController.php

@@ -67,11 +67,13 @@ public function deletePost(
         Request $request,
         EntityManagerInterface $entityManager,
         PostRepository $postRepository,
+        Filesystems $filesystems,
         string $id
     ) {
         $post = $postRepository->find($id);
         $submittedToken = $request->request->get('token');
         if ($request->isMethod('post') && $this->isCsrfTokenValid('delete-post', $submittedToken)) {
+            $filesystems->remove($post->getFile());
             $entityManager->remove($post);
             $entityManager->flush();
             $this->addFlash('success', 'Post deleted.');
@@ -111,6 +113,7 @@ public function savePost(
         $post->setAuthor($author);
 
         $entityManager->persist($post);
+        $entityManager->flush();
 
         /** @var UploadedFile $newFile */
         $newFile = $request->files->get('new_file');
@@ -120,25 +123,18 @@ public function savePost(
             }
             $file = $post->getFile() ?? new File();
             $file->setPost($post);
-            $oldExt = $file->getExtension();
             $file->setMimeType($newFile->getMimeType());
             $file->setSize($newFile->getSize());
             $file->setChecksum(sha1_file($newFile->getPathname()));
             $entityManager->persist($file);
             $post->setFile($file);
             $entityManager->persist($post);
             $entityManager->flush();
-            // Delete the old original, in case the extension has changed.
-            $filepathDataOld = '/files/' . $post->getId() . '.' . $oldExt;
-            if ($filesystems->data()->has($filepathDataOld)) {
-                $filesystems->data()->delete($filepathDataOld);
-            }
+            // Remove before adding, for replacement files with new extensions.
+            $filesystems->remove($file);
             $filesystems->write($filesystems->data(), $file, $newFile->getPathname());
-            $filesystems->temp()->deleteDir('files/' . $post->getId() . '/');
         }
 
-        $entityManager->flush();
-
         $this->addFlash('success', 'Post saved.');
         return $this->redirectToRoute('post_view', ['id' => $post->getId()]);
     }

src/Filesystems.php

@@ -42,6 +42,24 @@ public function write(Filesystem $fs, File $file, string $filePath)
         }
     }
 
+    /**
+     * Delete a file from both filesystems.
+     * @param File $file
+     * @return bool
+     */
+    public function remove(File $file): bool
+    {
+        // Delete actual file.
+        $storagePath = $this->getDataStoragePath($file);
+        $dataDeleted = true;
+        if ($this->data()->has($storagePath)) {
+            $dataDeleted = $this->data()->delete($storagePath);
+        }
+        // Delete temp versions.
+        $tempDeleted = $this->temp()->deleteDir('/files/' . $file->getPost()->getId());
+        return $dataDeleted && $tempDeleted;
+    }
+
     /**
      * Get a stream of a file, resizing it if requested (in which case it'll always be a JPEG).
      * @param File $file The file to fetch.