Merge pull request #2 from gregi99/patch-1

cache tags + destruct at the end
nediam · Feb 11, 2016 · 0412e2d · 0412e2d
2 parents 9f5edda + 56d4cd7
commit 0412e2d
Showing 1 changed file with 20 additions and 21 deletions.
diff --git a/Service/PhraseApp.php b/Service/PhraseApp.php
@@ -64,6 +64,11 @@ class PhraseApp implements LoggerAwareInterface
      */
     private $downloadedLocales = [];
 
+    /**
+     * @var array
+     */
+    private $tagCache = [];
+
     /**
      * @var LoggerInterface
      */
@@ -108,6 +113,11 @@ public function __construct(PhraseAppClient $client, TranslationLoader $translat
         $this->fileMerger        = $fileMerger;
     }
 
+    public function __destruct()
+    {
+        $this->cleanUp();
+    }
+
     /**
      * Sets a logger instance on the object.
      *
@@ -151,26 +161,9 @@ public function getLocales()
      */
     protected function downloadLocale($targetLocale)
     {
+
         $sourceLocale = $this->locales[$targetLocale];
 
-        if (true === array_key_exists($sourceLocale, $this->downloadedLocales)) {
-            $this->logger->notice('Copying translations for locale "{targetLocale}" from "{sourceLocale}".', [
-                'targetLocale' => $targetLocale,
-                'sourceLocale' => $sourceLocale
-            ]);
-
-            foreach ($this->catalogues as $catalogueName => $catalogueConfig) {
-                $extension = $catalogueConfig['output_format'];
-
-                $tmpFile = sprintf('%s/%s.%s.%s', $this->getTmpPath(), $catalogueName, $targetLocale, $extension);
-
-                // Make copy because operated catalogues must belong to the same locale
-                copy($this->downloadedLocales[$sourceLocale][$catalogueName], $tmpFile);
-            }
-
-            return $this->downloadedLocales[$sourceLocale];
-        }
-
         $this->logger->notice('Downloading translations for locale "{targetLocale}" from "{sourceLocale}".', [
             'targetLocale' => $targetLocale,
             'sourceLocale' => $sourceLocale
@@ -229,14 +222,22 @@ protected function downloadLocale($targetLocale)
      */
     protected function makeDownloadRequest($locale, $format, $tag)
     {
+        if (array_key_exists($locale, $this->tagCache) && array_key_exists($tag, $this->tagCache[$locale])) {
+            return $this->tagCache[$locale][$tag];
+        }
+
         $response = $this->client->request('locale.download', [
             'project_id'  => $this->projectId,
             'id'          => $locale,
             'file_format' => $format,
             'tag'         => $tag,
         ]);
 
-        return $response['text']->getContents();
+        $content = $response['text']->getContents();
+
+        $this->tagCache[$locale][$tag] = $content;
+
+        return $content;
     }
 
     /**
@@ -270,8 +271,6 @@ public function process(array $locales)
             $this->downloadLocale($locale);
             $this->dumpMessages($locale);
         }
-
-        $this->cleanUp();
     }
 
     /**