enable cross tandoor importing

cookbook/helper/recipe_url_import.py

@@ -424,3 +424,18 @@ def get_images_from_soup(soup, url):
             if 'http' in u:
                 images.append(u)
     return images
+
+
+def clean_dict(input_dict, key):
+    if type(input_dict) == dict:
+        for x in list(input_dict):
+            if x == key:
+                del input_dict[x]
+            elif type(input_dict[x]) == dict:
+                input_dict[x] = clean_dict(input_dict[x], key)
+            elif type(input_dict[x]) == list:
+                temp_list = []
+                for e in input_dict[x]:
+                    temp_list.append(clean_dict(e, key))
+
+    return input_dict

cookbook/views/api.py

@@ -1,6 +1,7 @@
 import io
 import json
 import mimetypes
+import pathlib
 import re
 import threading
 import traceback
@@ -56,7 +57,7 @@ from cookbook.helper.permission_helper import (CustomIsAdmin, CustomIsOwner,
                                                CustomIsSpaceOwner, CustomIsUser, group_required,
                                                is_space_owner, switch_user_active_space, above_space_limit, CustomRecipePermission, CustomUserPermission, CustomTokenHasReadWriteScope, CustomTokenHasScope, has_group_permission)
 from cookbook.helper.recipe_search import RecipeFacet, RecipeSearch
-from cookbook.helper.recipe_url_import import get_from_youtube_scraper, get_images_from_soup
+from cookbook.helper.recipe_url_import import get_from_youtube_scraper, get_images_from_soup, clean_dict
 from cookbook.helper.scrapers.scrapers import text_scraper
 from cookbook.helper.shopping_helper import RecipeShoppingEditor, shopping_helper
 from cookbook.models import (Automation, BookmarkletImport, CookLog, CustomFilter, ExportLog, Food,
@@ -87,7 +88,7 @@ from cookbook.serializer import (AutomationSerializer, BookmarkletImportListSeri
                                  SupermarketCategorySerializer, SupermarketSerializer,
                                  SyncLogSerializer, SyncSerializer, UnitSerializer,
                                  UserFileSerializer, UserSerializer, UserPreferenceSerializer,
-                                 UserSpaceSerializer, ViewLogSerializer, AccessTokenSerializer, FoodSimpleSerializer)
+                                 UserSpaceSerializer, ViewLogSerializer, AccessTokenSerializer, FoodSimpleSerializer, RecipeExportSerializer)
 from cookbook.views.import_export import get_integration
 from recipes import settings
 
@@ -1174,6 +1175,18 @@ def recipe_from_source(request):
                         # 'recipe_html': '',
                         'recipe_images': [],
                     }, status=status.HTTP_200_OK)
+            if re.match('^(.)*/view/recipe/[0-9]+/[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$', url):
+                recipe_json = requests.get(url.replace('/view/recipe/', '/api/recipe/').replace(re.split('/view/recipe/[0-9]+', url)[1], '') + '?share=' + re.split('/view/recipe/[0-9]+', url)[1].replace('/', '')).json()
+                recipe_json = clean_dict(recipe_json, 'id')
+                serialized_recipe = RecipeExportSerializer(data=recipe_json, context={'request': request})
+                if serialized_recipe.is_valid():
+                    recipe = serialized_recipe.save()
+                    recipe.image = File(handle_image(request, File(io.BytesIO(requests.get(recipe_json['image']).content), name='image'), filetype=pathlib.Path(recipe_json['image']).suffix),
+                                        name=f'{uuid.uuid4()}_{recipe.pk}{pathlib.Path(recipe_json["image"]).suffix}')
+                    recipe.save()
+                    return Response({
+                        'link': request.build_absolute_uri(reverse('view_recipe', args={recipe.pk}))
+                    }, status=status.HTTP_201_CREATED)
             else:
                 try:
                     if validators.url(url, public=True):

vue/src/apps/ImportView/ImportView.vue

@@ -24,8 +24,11 @@
                                             <div class="row justify-content-center">
                                                 <div class="col-12 justify-content-cente">
                                                     <b-checkbox v-model="import_multiple" switch><span
-                                                        v-if="import_multiple"><i class="far fa-copy fa-fw"></i> {{ $t('Multiple') }}</span><span
+                                                        v-if="import_multiple"><i
-                                                        v-if="!import_multiple"><i class="far fa-file fa-fw"></i> {{ $t('Single') }}</span></b-checkbox>
+                                                        class="far fa-copy fa-fw"></i> {{ $t('Multiple') }}</span><span
+                                                        v-if="!import_multiple"><i
+                                                        class="far fa-file fa-fw"></i> {{ $t('Single') }}</span>
+                                                    </b-checkbox>
                                                 </div>
                                             </div>
                                             <b-input-group class="mt-2" :class="{ bounce: empty_input }"
@@ -242,13 +245,15 @@
                                             <b-spinner variant="primary"></b-spinner>
                                         </div>
                                         <b-button-group>
-                                            <b-button @click="importRecipe('view')" v-if="!import_multiple" :disabled="import_loading">Import &
+                                            <b-button @click="importRecipe('view')" v-if="!import_multiple"
+                                                      :disabled="import_loading">Import &
                                                 View
                                             </b-button> <!-- TODO localize -->
                                             <b-button @click="importRecipe('edit')" variant="success"
                                                       v-if="!import_multiple" :disabled="import_loading">Import & Edit
                                             </b-button>
-                                            <b-button @click="importRecipe('import')" v-if="!import_multiple" :disabled="import_loading">Import &
+                                            <b-button @click="importRecipe('import')" v-if="!import_multiple"
+                                                      :disabled="import_loading">Import &
                                                 Restart
                                             </b-button>
                                             <b-button @click="location.reload()" :disabled="import_loading">Restart
@@ -622,6 +627,10 @@ export default {
             }
 
             return axios.post(resolveDjangoUrl('api_recipe_from_source'), payload,).then((response) => {
+                if (response.status === 201 && 'link' in response.data) {
+                    window.location = response.data.link
+                }
+
                 this.loading = false
                 this.recipe_json = response.data['recipe_json'];