Merge pull request #26 from tikoflano/fix/17

Changed filename id format

.gitignore

@@ -2,3 +2,5 @@
 \.idea/
 
 vendor/
+/nbproject/private/
+project.*

README.md

@@ -91,4 +91,10 @@ You can choose to secure the mails and ask for a password:
 
 Doing so, only mails containing '**:your_password**' in their content will be saved.
 
+### Changing the generated filename id
 
+By default the generated files start with an identifier in the format *'Y-m-d H:i:s'*. This identifier can be changed using 
+
+>     ./occ config:app:set --value <NEW FORMAT> files_frommail filename_id
+  
+The `<NEW FORMAT>` value is a string using PHP [`date()`](https://www.php.net/manual/en/function.date.php) format.

lib/Service/ConfigService.php

@@ -32,9 +32,11 @@
 class ConfigService {
 
 	const FROMMAIL_ADDRESSES = 'frommail_addresses';
+	const FROMMAIL_FILENAMEID = 'filename_id';
 
 	private $defaults = [
-		self::FROMMAIL_ADDRESSES => ''
+		self::FROMMAIL_ADDRESSES => '',
+		self::FROMMAIL_FILENAMEID => 'Y-m-d H:i:s',
 	];
 
 	/** @var string */

lib/Service/MailService.php

@@ -81,7 +81,7 @@ public function parseMail($content, $userId) {
 		$mail->setText($content);
 
 		$data = $this->parseMailHeaders($mail);
-		$data['date'] = date('Y-m-d H:i:s');
+		$data['id'] = date($this->configService->getAppValue(ConfigService::FROMMAIL_FILENAMEID));
 		$data['userId'] = $userId;
 
 		$done = [];
@@ -114,14 +114,14 @@ private function generateLocalContentFromMail(Parser $mail, $to, $data) {
 		$subject = $data['subject'];
 		$from = $data['from'];
 		$userId = $data['userId'];
-		$date = $data['date'];
+		$id = $data['id'];
 
 		$this->verifyInfoAndPassword($text, $toInfo);
 
 		$this->count = 0;
 		$folder = $this->getMailFolder($userId, $to, $from);
-		$this->createLocalFile($folder, $date, 'mail-' . $subject . '.txt', $text);
-		$this->createLocalFileFromAttachments($date, $folder, $mail->getAttachments());
+		$this->createLocalFile($folder, $id, 'mail-' . $subject . '.txt', $text);
+		$this->createLocalFileFromAttachments($id, $folder, $mail->getAttachments());
 	}
 
 
@@ -352,4 +352,4 @@ private function saveMailAddresses($addresses) {
 	}
 
 
-}
+}