From fee0236c87c4eb35f22052d09caa7eb3400db605 Mon Sep 17 00:00:00 2001
From: brandonkelly <brandon@pixelandtonic.com>
Date: Fri, 28 Feb 2025 10:36:36 -0800
Subject: [PATCH] =?UTF-8?q?Uploads=20=E2=86=92=20WpContent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Resolves #11
---
 src/acfadapters/File.php                              | 4 ++--
 src/acfadapters/Image.php                             | 4 ++--
 src/generators/fields/Media.php                       | 4 ++--
 src/generators/volumes/{Uploads.php => WpContent.php} | 7 ++++---
 src/importers/Media.php                               | 6 +++---
 5 files changed, 13 insertions(+), 12 deletions(-)
 rename src/generators/volumes/{Uploads.php => WpContent.php} (89%)

diff --git a/src/acfadapters/File.php b/src/acfadapters/File.php
index 7052cab..943f24b 100644
--- a/src/acfadapters/File.php
+++ b/src/acfadapters/File.php
@@ -12,7 +12,7 @@
 use craft\helpers\Assets as AssetsHelper;
 use craft\helpers\FileHelper;
 use craft\wpimport\BaseAcfAdapter;
-use craft\wpimport\generators\volumes\Uploads;
+use craft\wpimport\generators\volumes\WpContent;
 use craft\wpimport\importers\Media;
 use Illuminate\Support\Collection;
 use Throwable;
@@ -29,7 +29,7 @@ public static function type(): string
 
     public function create(array $data): FieldInterface
     {
-        $sourceKey = sprintf('volume:%s', Uploads::get()->uid);
+        $sourceKey = sprintf('volume:%s', WpContent::get()->uid);
         $field = new Assets();
         $field->maxRelations = 1;
         $field->sources = [$sourceKey];
diff --git a/src/acfadapters/Image.php b/src/acfadapters/Image.php
index 0789ff9..1975b0d 100644
--- a/src/acfadapters/Image.php
+++ b/src/acfadapters/Image.php
@@ -10,7 +10,7 @@
 use craft\base\FieldInterface;
 use craft\fields\Assets;
 use craft\wpimport\BaseAcfAdapter;
-use craft\wpimport\generators\volumes\Uploads;
+use craft\wpimport\generators\volumes\WpContent;
 use craft\wpimport\importers\Media;
 use Illuminate\Support\Collection;
 use Throwable;
@@ -27,7 +27,7 @@ public static function type(): string
 
     public function create(array $data): FieldInterface
     {
-        $sourceKey = sprintf('volume:%s', Uploads::get()->uid);
+        $sourceKey = sprintf('volume:%s', WpContent::get()->uid);
         $field = new Assets();
         $field->maxRelations = 1;
         $field->sources = [$sourceKey];
diff --git a/src/generators/fields/Media.php b/src/generators/fields/Media.php
index 0387760..882834d 100644
--- a/src/generators/fields/Media.php
+++ b/src/generators/fields/Media.php
@@ -9,7 +9,7 @@
 
 use craft\base\FieldInterface;
 use craft\fields\Assets;
-use craft\wpimport\generators\volumes\Uploads;
+use craft\wpimport\generators\volumes\WpContent;
 
 /**
  * @author Pixel & Tonic, Inc. <support@pixelandtonic.com>
@@ -23,7 +23,7 @@ protected static function uid(): string
 
     protected static function create(): FieldInterface
     {
-        $sourceKey = sprintf('volume:%s', Uploads::get()->uid);
+        $sourceKey = sprintf('volume:%s', WpContent::get()->uid);
         $field = new Assets();
         $field->name = 'Media';
         $field->handle = 'media';
diff --git a/src/generators/volumes/Uploads.php b/src/generators/volumes/WpContent.php
similarity index 89%
rename from src/generators/volumes/Uploads.php
rename to src/generators/volumes/WpContent.php
index 350a767..22d070d 100644
--- a/src/generators/volumes/Uploads.php
+++ b/src/generators/volumes/WpContent.php
@@ -22,7 +22,7 @@
 /**
  * @author Pixel & Tonic, Inc. <support@pixelandtonic.com>
  */
-class Uploads extends BaseVolumeGenerator
+class WpContent extends BaseVolumeGenerator
 {
     protected static function uid(): string
     {
@@ -31,8 +31,9 @@ protected static function uid(): string
 
     protected static function populate(Volume $volume): void
     {
-        $volume->name = 'Uploads';
-        $volume->handle = 'uploads';
+        $volume->name = 'WordPress Content';
+        $volume->handle = 'wpContent';
+        $volume->subpath = 'wp-content';
         $volume->setFsHandle(UploadsFs::get()->handle);
     }
 
diff --git a/src/importers/Media.php b/src/importers/Media.php
index 7372344..65cd74a 100644
--- a/src/importers/Media.php
+++ b/src/importers/Media.php
@@ -21,8 +21,8 @@
 use craft\wpimport\generators\fields\Description;
 use craft\wpimport\generators\fields\WpTitle;
 use craft\wpimport\generators\filesystems\Uploads as UploadsFs;
-use craft\wpimport\generators\volumes\Uploads;
-use craft\wpimport\generators\volumes\Uploads as UploadsVolume;
+use craft\wpimport\generators\volumes\WpContent;
+use craft\wpimport\generators\volumes\WpContent as UploadsVolume;
 use Throwable;
 use yii\console\Exception;
 
@@ -61,7 +61,7 @@ public function populate(ElementInterface $element, array $data): void
         $folder = Craft::$app->assets->ensureFolderByFullPathAndVolume($path !== '.' ? $path : '', UploadsVolume::get());
 
         /** @var Asset $element */
-        $element->volumeId = Uploads::get()->id;
+        $element->volumeId = WpContent::get()->id;
         $title = $data['title']['raw'] ?? $filename;
         $element->title = StringHelper::safeTruncate($title, 255);
         $element->setFieldValue(WpTitle::get()->handle, $title);