allow download after zip

Kallef Alexandre · Kallef Alexandre · commit 3d6fd0c674bc · 2022-09-06T16:36:23.000-03:00
diff --git a/src/Epub.php b/src/Epub.php
@@ -163,21 +163,22 @@ protected function generateMimeType(): void
      * @param string $path
      * @return void
      */
-    public function saveRaw(string $path): void
+    public function saveRaw(string $path): string
     {
         $this->generateEpub();
-        FileManager::getInstance()->copyAllTo($path);
+        return FileManager::getInstance()->copyAllTo($path);
     }
 
-    public function save(string $path, string $filename = null): void
+    public function save(string $path, string $filename = null): string
     {
         $this->generateEpub();
-        $filename = $filename ?: Str::slugify($this->getTitle()) . '.epub';
-        FileManager::getInstance()->compressAllTo($filename, $path);
+        return FileManager::getInstance()->compressAllTo($this->getFilename($filename), $path);
     }
 
-    public function download()
+    public function download(string $filename = null)
     {
+        $this->generateEpub();
+        return FileManager::getInstance()->download($this->getFilename($filename));
     }
 
     /**
@@ -195,4 +196,9 @@ public function setTitle(string $title): void
     {
         $this->title = $title;
     }
+    
+    protected function getFilename(string $filename = null): string
+    {
+        return $filename ?: Str::slugify($this->getTitle()) . '.epub';
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -163,21 +163,22 @@ protected function generateMimeType(): void`
`163`	`163`	`* @param string $path`
`164`	`164`	`* @return void`
`165`	`165`	`*/`
`166`		`- public function saveRaw(string $path): void`
	`166`	`+ public function saveRaw(string $path): string`
`167`	`167`	`{`
`168`	`168`	`$this->generateEpub();`
`169`		`- FileManager::getInstance()->copyAllTo($path);`
	`169`	`+ return FileManager::getInstance()->copyAllTo($path);`
`170`	`170`	`}`
`171`	`171`
`172`		`- public function save(string $path, string $filename = null): void`
	`172`	`+ public function save(string $path, string $filename = null): string`
`173`	`173`	`{`
`174`	`174`	`$this->generateEpub();`
`175`		`- $filename = $filename ?: Str::slugify($this->getTitle()) . '.epub';`
`176`		`- FileManager::getInstance()->compressAllTo($filename, $path);`
	`175`	`+ return FileManager::getInstance()->compressAllTo($this->getFilename($filename), $path);`
`177`	`176`	`}`
`178`	`177`
`179`		`- public function download()`
	`178`	`+ public function download(string $filename = null)`
`180`	`179`	`{`
	`180`	`+ $this->generateEpub();`
	`181`	`+ return FileManager::getInstance()->download($this->getFilename($filename));`
`181`	`182`	`}`
`182`	`183`
`183`	`184`	`/**`
`@@ -195,4 +196,9 @@ public function setTitle(string $title): void`
`195`	`196`	`{`
`196`	`197`	`$this->title = $title;`
`197`	`198`	`}`
	`199`	`+`
	`200`	`+ protected function getFilename(string $filename = null): string`
	`201`	`+ {`
	`202`	`+ return $filename ?: Str::slugify($this->getTitle()) . '.epub';`
	`203`	`+ }`
`198`	`204`	`}`