Corrects issue with backup/transfer of Illustrator preferences

Author: jonesiscoding

bin/console

@@ -16,6 +16,6 @@ $command[] = new Command\AdobeInfoCommand();
 $command[] = new Command\AdobeBackupCommand();
 $command[] = new Command\AdobeTransferCommand();
 $command[] = new Command\MenuAddCommand();
-$app       = new Application('MacPrefer', 'v1.3.3');
+$app       = new Application('MacPrefer', 'v1.3.4');
 $app->addCommands($command);
 $app->run();

composer.json

@@ -14,7 +14,7 @@
             "email": "aaron@jonesicoding.com"
         }
     ],
-    "version": "1.3.3",
+    "version": "1.3.4",
     "require": {
         "ext-json": "*",
         "ext-posix": "*",

dist/prefer.phar

@@ -2,7 +2,10 @@
   "illustrator": {
     "sap": "ILST",
     "names": [ "Illustrator", "Illustrator CC" ],
-    "preferences": ["Library/Preferences/Adobe Illustrator {baseVersion}"],
+    "preferences": [
+      "Library/Preferences/Adobe/Adobe Illustrator/{version}",
+      "Library/Preferences/Adobe Illustrator {majorVersion} Settings"
+    ],
     "path": "Adobe {name} {year}/Adobe Illustrator.app",
     "baseVersions": {
       "21.0.0": "2017",
@@ -31,7 +34,8 @@
     "path": "Adobe {name} {year}/Adobe {name} {year}.app",
     "preferences": [
       "Library/Preferences/Adobe {name} {year} Settings",
-      "Library/Preferences/Adobe {name} {year} Paths"
+      "Library/Preferences/Adobe {name} {year} Paths",
+      "Library/Preferences/Adobe/Photoshop/{baseVersion}"
     ],
     "baseVersions": {
       "18.0": "2017",

resources/config/cc.json

@@ -139,8 +139,8 @@ public function execute(InputInterface $input, OutputInterface $output)
 
     // Version Replacement
     $this->io()->msg('Verifying Application Versions', 50);
-    $srcVer = $src->getBaseVersion();
-    $dstVer = $dst->getBaseVersion();
+    $srcVer = $src->getVersion();
+    $dstVer = $dst->getVersion();
     if (empty($srcVer) || empty($dstVer))
     {
       $this->io()->errorln('[ERROR]');
@@ -154,6 +154,22 @@ public function execute(InputInterface $input, OutputInterface $output)
       $this->io()->successln('[DONE]');
     }
 
+    $this->io()->msg('Verifying Application Base Versions', 50);
+    $srcBaseVer = $src->getBaseVersion();
+    $dstBaseVer = $dst->getBaseVersion();
+    if (empty($srcBaseVer) || empty($dstBaseVer))
+    {
+      $this->io()->errorln('[ERROR]');
+
+      $this->io()->errorblk(sprintf('Could not verify versions for %s', $src->getName(false)));
+
+      return self::EXIT_ERROR;
+    }
+    else
+    {
+      $this->io()->successln('[DONE]');
+    }
+
     // Year Replacement
     $this->io()->msg('Verifying Application Year', 50);
     $srcYear = $src->getYear();
@@ -188,9 +204,12 @@ public function execute(InputInterface $input, OutputInterface $output)
       $this->io()->successln('[DONE]');
     }
 
+    $srcMajor = substr($srcVer, 0, strpos($srcVer, '.'));
+    $dstMajor = substr($dstVer, 0, strpos($dstVer, '.'));
+
     // Prep Search & Replace
-    $search  = [$srcVer, $srcName];
-    $replace = [$dstVer, $dstName];
+    $search  = [$srcVer, $srcBaseVer, $srcName, $srcMajor];
+    $replace = [$dstVer, $dstBaseVer, $dstName, $dstMajor];
     if (!empty($srcYear))
     {
       $search[]  = $srcYear;
@@ -248,6 +267,12 @@ protected function copyPreferences($srcPrefs, $search, $replace)
       $srcPath = sprintf('%s/%s', $uDir, $srcPref);
       $dstPath = sprintf('%s/%s', $uDir, $dstPref);
 
+      if ($this->io()->getOutput()->isDebug())
+      {
+        $this->io()->write('  From...', null, 10)->writeln($srcPath);
+        $this->io()->write('  To...', null, 10)->writeln($dstPath);
+      }
+
       if (file_exists($srcPath))
       {
         // Use Rsync for Directories

src/Command/AdobeTransferCommand.php

@@ -110,9 +110,11 @@ public function getPreferences()
     {
       if (!empty($info['preferences']))
       {
+        $find    = ['{name}', '{year}', '{version}', '{baseVersion}', '{majorVersion}'];
+        $replace = [$this->getName(false), $this->getYear(), $this->getVersion(), $this->getBaseVersion(), $this->getMajorVersion()];
         foreach ($info['preferences'] as $pr)
         {
-          $prefs[] = str_replace(['{name}', '{year}', '{version}'], [$this->getName(false), $this->getYear(), $this->getBaseVersion()], $pr);
+          $prefs[] = str_replace($find, $replace, $pr);
         }
       }
     }
@@ -168,6 +170,11 @@ public function getVersion()
     return $this->version;
   }
 
+  public function getMajorVersion()
+  {
+    return substr($this->getVersion(), 0, strpos($this->getVersion(), '.'));
+  }
+
   /**
    * Returns the name of this application, including the year if applicable.
    *