refactor

Author: AidasK

LICENSE

@@ -2,6 +2,7 @@ The MIT License (MIT)
 
 Copyright (c) 2014 UFirst Group
 Copyright (c) 2017 HighSolutions
+Copyright (c) 2019 Aidas Klimas
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +20,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

README.md

@@ -1,4 +1,4 @@
-![Laravel-Lang-Import-Export by HighSolutions](https://raw.githubusercontent.com/highsolutions/laravel-lang-import-export/master/intro.jpg)
+![Laravel-Lang-Import-Export v6](https://raw.githubusercontent.com/AidasK/laravel-lang-import-export/master/logo.png)
 
 Laravel-Lang-Import-Export
 ==========================
@@ -45,7 +45,7 @@ Add the following line to the `require` section of your Laravel webapp's `compos
 
 ```javascript
     "require": {
-        "HighSolutions/laravel-lang-import-export": "5.4.*"
+        "AidasK/laravel-lang-import-export": "6.0.*"
     }
 ```
 
@@ -57,7 +57,7 @@ For previous versions of Laravel, you need to update `config/app.php` by adding
 ```php
     'providers' => array(
         /* ... */
-        'HighSolutions\LangImportExport\LangImportExportServiceProvider'
+        'AidasK\LangImportExportServiceProvider'
     )
 ```
 
@@ -69,47 +69,22 @@ The package currently provides two commands, one for exporting the files and one
 ### Export
 
 ```bash
-php artisan lang:export
-php artisan lang:export en * path/to/export
-php artisan lang:export en auth -A -X
+php artisan lang:export --locale en
+php artisan lang:export --locale en --target fr # export en translations only missing in fr locale
 ```
 
-When you call command without parameters, export file will be generated for all localization files within default locale. But you can define **locale** explicitly. You can also export only one file (second parameter - **group**) and define where to store file (you can provide name with and without .csv extension). When you use **output** argument, default path is base_path() -> catalog of your whole project.
-But there is few more useful parameters:
-
-| name of parameter | description                             | is required? | default value                      |
-|-------------------|-----------------------------------------|--------------|------------------------------------|
-| locale           | The locale to be exported. Multiple separated by comma                | NO           | default lang of application        |
-| group            | The name of translation file to export   | NO           | \* - all files                     |
-| output           | Filename of exported translation files   | NO           | storage/app/lang-import-export.csv |
-| -A / --append    | Append name of group to the name of file | NO           | empty                              |
-| -X / --excel     | Set file encoding (UTF-16) for Excel     | NO           | UTF-8                              |
-| -D / --delimiter | Field delimiter                          | NO           | ,                                  |
-| -E / --enclosure | Field enclosure                          | NO           | "                                  |
-| -T / --target-locale | Only missing keys for for this locale are exported                          | NO           | "                                  |
 ### Import
 
 ```
 php artisan lang:import
-php artisan lang:import en * path/to/import
-php artisan lang:import en auth -X
 ```
 
-When you call command without parameters - it will try to read default file of export command without parameters for default locale and all localization files. You can of course specify all parameters (**locale**, **group**, **input**) and there is few more options:
-
-| name of parameter | description                                  | is required? | default value                      |
-|-------------------|----------------------------------------------|--------------|------------------------------------|
-| locale            | The locale to be imported                    | NO           | default lang of application        |
-| group             | The name of translation file to import       | NO           | * - all files                      |
-| output            | Filename of translation files to be imported | NO           | storage/app/lang-import-export.csv |
-| -X / --excel      | Set file encoding from Excel                 | NO           | UTF-8                              |
-| -D / --delimiter  | Field delimiter                              | NO           | ,                                  |
-| -E / --enclosure  | Field enclosure                              | NO           | "                                  |
-| -C / --escape     | Field escape                                 | NO           | \                                  |
-
 Changelog
 ------------
 
+6.0.0
+* refactor whole repository
+
 5.4.10
 * Laravel 5.7 support
 
@@ -142,17 +117,10 @@ Changelog
 - add support for export and import all localization files
 - any arguments are not required
 
-Roadmap
-------------
-
-* Removing tabs from text
-* Option for deleting export file after importing.
-* Option for excluding certain files (and system ones).
-* Unit tests!
 
 Credits
 ------------
 
 This package was originally created by [UFirst](http://github.com/ufirstgroup) and is available here: [Laravel-lang-import-export](https://github.com/ufirstgroup/laravel-lang-import-export).
 
-Currently is developed by [HighSolutions](https://highsolutions.org), software house from Poland in love in Laravel.
+Currently is developed by [Aidas Klimas](https://klimas.lt/), software house from Lithuania

composer.json

@@ -1,8 +1,12 @@
 {
-    "name": "highsolutions/laravel-lang-import-export",
+    "name": "AidasK/laravel-lang-import-export",
     "description": "A Laravel package providing artisan commands to import and export language files from and to CSV.",
     "keywords": ["laravel", "localization", "translation", "messages", "import", "export", "CSV"],
     "authors": [
+        {
+            "name": "Aidas Klimas",
+            "email": "[email protected]"
+        },
         {
             "name": "Michael Ruoss",
             "email": "[email protected]"
@@ -19,7 +23,7 @@
     },
     "autoload": {
         "psr-4": {
-            "HighSolutions\\LangImportExport\\": "src/"
+            "LangImportExport\\": "src/"
         },
         "files": [
             "src/Support/helpers.php"
@@ -30,8 +34,8 @@
         "frameworks": ["Laravel 5.7"],
         "laravel": {
             "providers": [
-                "HighSolutions\\LangImportExport\\LangImportExportServiceProvider"
-            ]            
+                "LangImportExport\\LangImportExportServiceProvider"
+            ]
         }
     },
     "minimum-stability": "stable"

logo.png

@@ -1,11 +1,11 @@
 <?php
 
-namespace HighSolutions\LangImportExport\Console;
+namespace LangImportExport\Console;
 
 use Illuminate\Console\Command;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
-use HighSolutions\LangImportExport\Facades\LangListService;
+use LangImportExport\Facades\LangListService;
 
 class ExportToCsvCommand extends Command
 {
@@ -16,14 +16,13 @@ class ExportToCsvCommand extends Command
      * @var string
      */
     protected $signature = 'lang:export 
-    						{locale? : The locales to be exported. Separated by comma (default - default lang of application).} 
-    						{group? : The name of translation file to export (default - all files).} 
-    						{output? : Filename of exported translation, :locale, :target is replaced (optional, default - :locale:target-export.csv).} 
-    						{--A|append : Append name of group to the name of file (optional, default - empty).}
-    						{--X|excel : Set file encoding for Excel (optional, default - UTF-8).}
+    						{--l|locale? : The locales to be exported. Separated by comma (default - default lang of application).} 
+    						{--t|target: Target languages, only missing keys are exported. Separated by comma.} 
+    						{--g|group: The name of translation file to export (default, groups in config).} 
+    						{--o|output: Filename of exported translation, :locale, :target is replaced (optional, default - storage/:locale:target.csv).} 
+    						{--X|excel: Set file encoding for Excel (optional, default - UTF-8).}
     						{--D|delimiter=, : Field delimiter (optional, default - ",").} 
-    						{--E|enclosure=" : Field enclosure (optional, default - \'"\').} 
-    						{--T|target-locale=" : Target languages, only missing keys are exported. Separated by comma (optional).} ';
+    						{--E|enclosure=" : Field enclosure (optional, default - \'"\').} ';
 
     /**
      * The console command description.
@@ -39,31 +38,13 @@ class ExportToCsvCommand extends Command
      */
     protected $parameters = [];
 
-    /**
-     * Default path for file save.
-     *
-     * @var string
-     */
-    protected $defaultPath;
-
     /**
      * File extension (default .csv).
      *
      * @var string
      */
     protected $ext = '.csv';
 
-    /**
-     * Class constructor.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->defaultPath = base_path(':locale:target-export') . $this->ext;
-    }
-
     /**
      * Execute the console command.
      *
@@ -73,10 +54,10 @@ public function handle()
     {
         $this->getParameters();
 
-        $this->sayItsBeginning();
+        $this->info('Translations export started.');
 
         foreach ($this->strToArray($this->parameters['locale']) as $locale) {
-            foreach ($this->strToArray($this->parameters['target_locale'], [null]) as $target) {
+            foreach ($this->strToArray($this->parameters['target'], [null]) as $target) {
                 $translations = $this->getTranslations($locale, $target);
                 $this->saveTranslations($locale, $target, $translations);
                 $this->info(strtoupper($locale) . strtoupper($target ?: '') . ' Translations saved to: ' . $this->getOutputFileName($locale, $target));
@@ -99,44 +80,25 @@ private function strToArray($string, $fallback = [])
      */
     private function getParameters()
     {
-        $this->parameters = [
-            'group' => $this->argument('group'),
-            'locale' => $this->argument('locale') === null ? config('app.locale') : $this->argument('locale'),
-            'output' => $this->argument('output') === null ? $this->defaultPath : base_path($this->argument('output')),
-            'append' => $this->option('append') !== false,
-            'excel' => $this->option('excel') !== false,
+        $parameters = [
+            'locale' => $this->option('locale'),
+            'group' => $this->option('group'),
+            'output' => $this->option('output'),
+            'append' => $this->option('append'),
+            'excel' => $this->option('excel'),
             'delimiter' => $this->option('delimiter'),
             'enclosure' => $this->option('enclosure'),
-            'target_locale' => $this->option('target-locale'),
+            'target' => $this->option('target'),
         ];
-
-        $this->setDefaultPath();
-    }
-
-    /**
-     * Set possible file names.
-     *
-     * @return void
-     */
-    private function setDefaultPath()
-    {
+        $parameters = array_filter($parameters, function ($var) {
+            return !is_null($var);
+        });
+        $this->parameters = array_merge(config('lang_import_export.export'), $parameters);
         if ($this->parameters['append']) {
             $this->parameters['output'] .= '-' . $this->parameters['group'];
-            $this->defaultPath .= '-' . $this->parameters['group'];
         }
     }
 
-    /**
-     * Display output that command has started and which groups are being exported.
-     *
-     * @return void
-     */
-    private function sayItsBeginning()
-    {
-        $this->info(PHP_EOL
-            . 'Translations export of ' . ($this->parameters['group'] === null ? 'all groups' : $this->parameters['group'] . ' group') . ' - started.');
-    }
-
     /**
      * Get translations from localization files.
      *
@@ -180,7 +142,8 @@ private function saveTranslations($locale, $target, $translations)
      *
      * @param $locale
      * @param $target
-     * @return FilePointerResource
+     * @throws \Exception
+     * @return resource
      */
     private function openFile($locale, $target)
     {
@@ -190,7 +153,7 @@ private function openFile($locale, $target)
         }
 
         if (!($output = fopen($fileName, 'w'))) {
-            $output = fopen($this->defaultPath . $this->ext, 'w');
+            throw new \Exception("$fileName failed to open");
         }
 
         fputs($output, "\xEF\xBB\xBF");
@@ -201,7 +164,7 @@ private function openFile($locale, $target)
     /**
      * Save content of translation files to specified file.
      *
-     * @param FilePointerResource $output
+     * @param resource $output
      * @param array $translations
      * @return void
      */

src/Console/ExportToCsvCommand.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace HighSolutions\LangImportExport\Console;
+namespace LangImportExport\Console;
 
 use Illuminate\Console\Command;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
-use HighSolutions\LangImportExport\Facades\LangListService;
+use LangImportExport\Facades\LangListService;
 
 class ImportFromCsvCommand extends Command
 {

src/Console/ImportFromCsvCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace HighSolutions\LangImportExport\Facades;
+namespace LangImportExport\Facades;
 
 use Illuminate\Support\Facades\Facade;