Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/components/common/UrlInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import { ValidationState } from '@/utils/validationUtil'
const props = defineProps<{
modelValue: string
validateUrlFn?: (url: string) => Promise<boolean>
disableValidation?: boolean
}>()

const emit = defineEmits<{
Expand Down Expand Up @@ -102,8 +101,6 @@ const defaultValidateUrl = async (url: string): Promise<boolean> => {
}

const validateUrl = async (value: string) => {
if (props.disableValidation) return

if (validationState.value === ValidationState.LOADING) return

const url = cleanInput(value)
Expand Down
7 changes: 3 additions & 4 deletions src/platform/assets/components/UploadModelUrlInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<label class="text-sm text-muted mb-0">
{{ $t('assetBrowser.civitaiLinkLabel') }}
</label>
<UrlInput
<InputText
v-model="url"
:placeholder="$t('assetBrowser.civitaiLinkPlaceholder')"
:disable-validation="true"
class="w-full"
/>
<p v-if="error" class="text-xs text-error">
{{ error }}
Expand All @@ -30,10 +30,9 @@
</template>

<script setup lang="ts">
import InputText from 'primevue/inputtext'
import { computed } from 'vue'

import UrlInput from '@/components/common/UrlInput.vue'

const props = defineProps<{
modelValue: string
error?: string
Expand Down
9 changes: 9 additions & 0 deletions src/platform/assets/composables/useUploadModelWizard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,15 @@ export function useUploadModelWizard(modelTypes: Ref<ModelTypeOption[]>) {
async function fetchMetadata() {
if (!canFetchMetadata.value) return

// Clean and normalize URL
let cleanedUrl = wizardData.value.url.trim()
try {
cleanedUrl = new URL(encodeURI(cleanedUrl)).toString()
} catch {
// If URL parsing fails, just use the trimmed input
}
wizardData.value.url = cleanedUrl

if (!isCivitaiUrl(wizardData.value.url)) {
uploadError.value = st(
'assetBrowser.onlyCivitaiUrlsSupported',
Expand Down
Loading