upload multiple pictures

This commit is contained in:
m
2026-07-12 10:15:48 +02:00
parent 3a7cadfbde
commit 59304b4292
3 changed files with 80 additions and 33 deletions
+38 -22
View File
@@ -7,41 +7,52 @@ import { UploadProgress } from '../components/UploadProgress';
export function UploadScreen() { export function UploadScreen() {
const [uploadStatus, setUploadStatus] = useState<'idle' | 'uploading' | 'processing' | 'success' | 'error'>('idle'); const [uploadStatus, setUploadStatus] = useState<'idle' | 'uploading' | 'processing' | 'success' | 'error'>('idle');
const [error, setError] = useState<string>(); const [error, setError] = useState<string>();
const [uploadedCount, setUploadedCount] = useState(0);
const [totalCount, setTotalCount] = useState(0);
const upload = useUpload(); const upload = useUpload();
const pickImage = async () => { const pickImages = async () => {
try { try {
const { status } = await ImagePicker.requestMediaLibraryPermissionsAsync(); const { status } = await ImagePicker.requestMediaLibraryPermissionsAsync();
if (status !== 'granted') { if (status !== 'granted') {
Alert.alert('Permission requise', "L'accès à la galerie est nécessaire pour sélectionner une photo."); Alert.alert('Permission requise', "L'accès à la galerie est nécessaire pour sélectionner des photos.");
return; return;
} }
console.log('yes')
const result = await ImagePicker.launchImageLibraryAsync({ const result = await ImagePicker.launchImageLibraryAsync({
mediaTypes: ['images'], mediaTypes: ['images'],
quality: 1, quality: 1,
allowsMultipleSelection: true,
}); });
console.log(result)
if (result.canceled) return; if (result.canceled) return;
if (result.assets && result.assets[0]) { const assets = result.assets;
setUploadStatus('uploading'); if (assets.length === 0) return;
const asset = result.assets[0];
const file = {
uri: asset.uri,
type: asset.mimeType || 'image/jpeg',
name: asset.fileName || 'photo.jpg',
};
try { setUploadStatus('uploading');
const response = await upload.mutateAsync(file); setUploadedCount(0);
setUploadStatus('processing'); setTotalCount(assets.length);
console.log('Upload success:', response);
setUploadStatus('success'); const files = assets.map((asset) => ({
} catch (err) { uri: asset.uri,
type: asset.mimeType || 'image/jpeg',
name: asset.fileName || 'photo.jpg',
}));
try {
const response = await upload.mutateAsync(files);
setUploadedCount(response.uploaded.length);
if (response.errors.length > 0) {
setUploadStatus('error'); setUploadStatus('error');
setError(err instanceof Error ? err.message : 'Upload failed'); setError(`${response.uploaded.length}/${totalCount} uploadés. Erreurs : ${response.errors.map((e) => e.name).join(', ')}`);
} else {
setUploadStatus('success');
} }
} catch (err) {
setUploadStatus('error');
setError(err instanceof Error ? err.message : 'Upload failed');
} }
} catch (err) { } catch (err) {
Alert.alert('Erreur', "Impossible d'accéder à la galerie"); Alert.alert('Erreur', "Impossible d'accéder à la galerie");
@@ -50,10 +61,15 @@ export function UploadScreen() {
return ( return (
<View style={styles.container}> <View style={styles.container}>
<UploadProgress status={uploadStatus} error={error} /> <UploadProgress
status={uploadStatus}
error={error}
uploadedCount={uploadedCount}
totalCount={totalCount}
/>
<TouchableOpacity style={styles.uploadButton} onPress={pickImage}> <TouchableOpacity style={styles.uploadButton} onPress={pickImages}>
<Text style={styles.uploadText}>Sélectionner une photo</Text> <Text style={styles.uploadText}>Sélectionner des photos</Text>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
); );
+11 -3
View File
@@ -5,18 +5,24 @@ interface UploadProgressProps {
progress?: number; progress?: number;
status: 'idle' | 'uploading' | 'processing' | 'success' | 'error'; status: 'idle' | 'uploading' | 'processing' | 'success' | 'error';
error?: string; error?: string;
uploadedCount?: number;
totalCount?: number;
} }
export function UploadProgress({ progress, status, error }: UploadProgressProps) { export function UploadProgress({ progress, status, error, uploadedCount, totalCount }: UploadProgressProps) {
if (status === 'idle') return null; if (status === 'idle') return null;
const hasMulti = totalCount !== undefined && totalCount > 1;
return ( return (
<View style={styles.container}> <View style={styles.container}>
{status === 'uploading' && ( {status === 'uploading' && (
<> <>
<ActivityIndicator size="small" color="#1976D2" /> <ActivityIndicator size="small" color="#1976D2" />
<Text style={styles.text}> <Text style={styles.text}>
Upload en cours... {progress !== undefined && `${progress}%`} {hasMulti
? `Upload ${uploadedCount || 0}/${totalCount}...`
: `Upload en cours...${progress !== undefined ? ` ${progress}%` : ''}`}
</Text> </Text>
</> </>
)} )}
@@ -29,7 +35,9 @@ export function UploadProgress({ progress, status, error }: UploadProgressProps)
)} )}
{status === 'success' && ( {status === 'success' && (
<Text style={[styles.text, styles.success]}>Upload terminé !</Text> <Text style={[styles.text, styles.success]}>
{hasMulti ? `${uploadedCount} fichiers uploadés !` : 'Upload terminé !'}
</Text>
)} )}
{status === 'error' && ( {status === 'error' && (
+31 -8
View File
@@ -4,20 +4,43 @@ import { apiClient } from '../api/client';
import { API_BASE_URL, ENDPOINTS } from '../constants/api'; import { API_BASE_URL, ENDPOINTS } from '../constants/api';
import { OcrJob } from '../types'; import { OcrJob } from '../types';
export type UploadFile = { uri: string; type: string; name: string };
export type UploadResult = { name: string; id: string };
export function useUpload() { export function useUpload() {
const queryClient = useQueryClient(); const queryClient = useQueryClient();
return useMutation({ return useMutation({
mutationFn: async (file: { uri: string; type: string; name: string }) => { mutationFn: async (files: UploadFile[]) => {
const fsFile = new File(file.uri); const results = await Promise.allSettled(
const result = await fsFile.upload(`${API_BASE_URL}${ENDPOINTS.UPLOAD}`, { files.map(async (file) => {
httpMethod: 'POST', const fsFile = new File(file.uri);
uploadType: UploadType.MULTIPART, const result = await fsFile.upload(`${API_BASE_URL}${ENDPOINTS.UPLOAD}`, {
fieldName: 'file', httpMethod: 'POST',
mimeType: file.type, uploadType: UploadType.MULTIPART,
fieldName: 'file',
mimeType: file.type,
});
return JSON.parse(result.body) as UploadResult;
})
);
const uploaded: UploadResult[] = [];
const errors: { name: string; error: string }[] = [];
results.forEach((r, i) => {
if (r.status === 'fulfilled') {
uploaded.push(r.value);
} else {
errors.push({ name: files[i].name, error: r.reason?.message || 'Upload failed' });
}
}); });
return JSON.parse(result.body) as { id: string; ocrJobId: string }; if (errors.length > 0 && uploaded.length === 0) {
throw new Error(errors.map((e) => `${e.name}: ${e.error}`).join('\n'));
}
return { uploaded, errors };
}, },
onSuccess: () => { onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ['files'] }); queryClient.invalidateQueries({ queryKey: ['files'] });