More proper filenames in CsvWriter.

Author: dorantor

examples/example-downloaded.php

@@ -22,8 +22,8 @@
     $client->addProcessor(
         Gwt_Processor_CsvWriter::factory(array(
             'savePath'          => '.',
-            'dateFormat'        => 'Ymd-His',
-            'filenameTemplate'  => '{website}' . DIRECTORY_SEPARATOR . '{tableName}-{date}.csv',
+            'dateFormat'        => 'Ymd',
+            'filenameTemplate'  => '{website}' . DIRECTORY_SEPARATOR . '{tableName}-{dateStart}-{dateEnd}.csv',
         ))
     );
     foreach ($sites as $site => $siteOptions) {

src/Gwt/Processor/CsvWriter.php

@@ -40,14 +40,14 @@ class Gwt_Processor_CsvWriter
      *
      * @var string
      */
-    private $_dateFormat = 'Ymd-His';
+    private $_dateFormat = 'Ymd';
 
     /**
      * Template used to build filename
      *
      * @var string
      */
-    private $_filenameTemplate = '{website}-{tableName}-{date}.csv';
+    private $_filenameTemplate = '{website}-{tableName}-{dateStart}-{dateEnd}.csv';
 
     /**
      * Process data
@@ -136,33 +136,6 @@ public function setDateFormat($dateFormat)
         return $this;
     }
 
-    /**
-     * Set datetime to be used in filename
-     *
-     * @todo use clients dateStart-dateEnd
-     * @param DateTime $dt
-     * @return void
-     */
-    public function setDateTime(DateTime $dt)
-    {
-        $this->_dt = $dt;
-    }
-
-    /**
-     * Get datetime to be used in filename
-     *
-     * @todo use clients dateStart-dateEnd
-     * @return DateTime
-     */
-    public function getDateTime()
-    {
-        if (null !== $this->_dt) {
-            return $this->_dt;
-        }
-
-        return new DateTime('now', new DateTimeZone('UTC'));
-    }
-
     /**
      * Build filename using template
      *
@@ -179,10 +152,19 @@ protected function buildFilename($tableName)
         );
         $filename = str_replace('{tableName}', $tableName, $filename);
         $filename = str_replace(
-            '{date}',
-            $this->getDateTime()->format($this->getDateFormat()),
+            '{dateStart}',
+            $this->getClient()->getDateStart()->format($this->getDateFormat()),
             $filename
         );
+        $filename = str_replace(
+            '{dateEnd}',
+            $this->getClient()->getDateEnd()->format($this->getDateFormat()),
+            $filename
+        );
+
+        if (preg_match('#{[^}]*}#', $filename, $matches)) {
+            throw new Exception('Unknown placeholder is found: ' . var_export($matches[0], true));
+        }
 
         return $filename;
     }