Fix #12 - Cache doesn't take into account changed language

Author: OzzyCzech

composer.json

@@ -1,30 +1,23 @@
 {
 	"name": "om/potrans",
 	"description": "Command line tool for translate Gettext with Google Translator API",
-	"keywords": [
-		"potrans",
-		"gettext",
-		"google",
-		"translator"
-	],
-	"license": [
-		"BSD-3-Clause"
-	],
+	"keywords": ["potrans", "gettext", "google", "translator"],
+	"license": ["BSD-3-Clause"],
 	"authors": [
 		{
 			"name": "Roman Ožana",
 			"email": "roman@ozana.cz",
 			"homepage": "https://ozana.cz"
 		}
 	],
-	"bin": [
-		"bin/potrans"
-	],
+	"bin": ["bin/potrans"],
 	"require": {
 		"symfony/console": "^6.0",
 		"gettext/gettext": "^5.6",
 		"google/cloud-translate": "^1.12",
-		"symfony/cache": "^6.0"
+		"symfony/cache": "^6.0",
+		"ext-curl": "*",
+		"ext-json": "*"
 	},
 	"require-dev": {
 		"nette/tester": "^2.3"

readme.md

@@ -48,7 +48,7 @@ bin/potrans google tests/example-cs_CZ.po ~/Downloads --credentials=your-credent
 You can also change source and target language with `--form` and `--to` parametters:
 
 ```bash
-bin/potrans google tests/example-cs_CZ.po ~/Downloads --credentials=your-credentials-file.json --from=ru --to=en
+bin/potrans google tests/example-cs_CZ.po ~/Downloads --credentials=your-credentials-file.json --from=en --to=de
 ```
 
 ### Google Translate API Pricing

src/commands/DeepLTranslatorCommand.php

@@ -6,10 +6,6 @@
 use Gettext\Generator\PoGenerator;
 use Gettext\Loader\PoLoader;
 use Gettext\Translation;
-use GuzzleHttp\Client;
-use potrans\commands\DeepLTranslator;
-use potrans\commands\GoogleTranslator;
-use potrans\commands\ITranslator;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Exception\InvalidOptionException;
@@ -19,7 +15,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\HttpClient\HttpClient;
+use Throwable;
 
 class DeepLTranslatorCommand extends Command {
 
@@ -82,7 +78,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 					// translated counter
 					$translated++;
 
-					$translation = $cache->getItem(md5($sentence->getOriginal()));
+					$key = md5($sentence->getOriginal() . $from . $to);
+					$translation = $cache->getItem($key);
 					if (!$translation->isHit() || !$input->getOption('cache')) {
 
 						$curl = curl_init();
@@ -169,7 +166,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			// done!
 			$output->writeln('<info>DONE!</info>');
 
-		} catch (\Throwable $error) {
+		} catch (Throwable $error) {
 			$output->writeln(
 				[
 					'',

src/commands/GoogleTranslatorCommand.php

@@ -7,24 +7,17 @@
 use Gettext\Loader\PoLoader;
 use Gettext\Translation;
 use Gettext\Translations;
-use Google\ApiCore\ValidationException;
 use Google\Cloud\Translate\V3\TranslationServiceClient;
-use potrans\commands\DeepLTranslator;
-use potrans\commands\GoogleTranslator;
-use potrans\commands\ITranslator;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
-use Symfony\Component\Cache\Adapter\NullAdapter;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Exception\InvalidOptionException;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Contracts\Cache\CacheInterface;
-use Symfony\Contracts\Cache\ItemInterface;
+use Throwable;
 
 class GoogleTranslatorCommand extends Command {
 
@@ -113,7 +106,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 					// translated counter
 					$translated++;
 
-					$translation = $cache->getItem(md5($sentence->getOriginal()));
+					$key = md5($sentence->getOriginal() . $from . $to);
+					$translation = $cache->getItem($key);
 
 					if (!$translation->isHit() || !$input->getOption('cache')) {
 
@@ -178,7 +172,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			$poGenerator->generateFile($translations, $poOutputFile);
 
 			$output->writeln('<info>DONE!</info>');
-		} catch (\Throwable $error) {
+		} catch (Throwable $error) {
 			$output->writeln(
 				[
 					'',

src/potrans.php

@@ -4,7 +4,6 @@
 
 use potrans\commands\DeepLTranslatorCommand;
 use potrans\commands\GoogleTranslatorCommand;
-use potrans\commands\BaseInputDefinition;
 use Symfony\Component\Console\Application;
 
 if (file_exists(__DIR__ . '/../vendor/autoload.php')) {