refactor parser function

5 files changed, 18 insertions, 10 deletions

diff --git a/blocks/Xcos/ParserFunctions.py b/blocks/Xcos/ParserFunctions.py
index 07eb213c..a7807f37 100644
--- a/blocks/Xcos/ParserFunctions.py
+++ b/blocks/Xcos/ParserFunctions.py
@@ -380,11 +380,9 @@ def getOrdering(attrib, portCount, ParentComponent, orderingname):
     return ordering
 
 
-def getLinkStyle(attribid, sourceVertex, sourceType, targetVertex, targetType, waypoints):
+def switchPorts(sourceVertex, sourceType, targetVertex, targetType, waypoints):
     # switch vertices if required
     switch_split = False
-    style = None
-    addSplit = False
 
     if sourceType in ['ExplicitInputPort', 'ImplicitInputPort', 'ControlPort'] and \
             targetType in ['ExplicitOutputPort', 'ExplicitLink', 'ImplicitOutputPort', 'ImplicitLink', 'CommandPort', 'CommandControlLink']:
@@ -399,6 +397,15 @@ def getLinkStyle(attribid, sourceVertex, sourceType, targetVertex, targetType, w
         waypoints.reverse()
         switch_split = True
 
+    return (sourceType, sourceVertex, targetType, targetVertex, switch_split)
+
+
+def getLinkStyle(attribid, sourceVertex, sourceType, targetVertex, targetType, waypoints):
+    (sourceVertex, sourceType, targetVertex, targetType, switch_split) = switchPorts(sourceVertex, sourceType, targetVertex, targetType, waypoints)
+
+    style = None
+    addSplit = False
+
     if sourceType in ['ExplicitInputPort', 'ExplicitOutputPort', 'CommandPort', 'ControlPort'] and \
             targetType == sourceType:
         print(attribid, 'cannot connect two ports of', sourceType, 'and', targetType)
diff --git a/blocks/saveAPI/admin.py b/blocks/saveAPI/admin.py
index e333618c..5d8937e5 100644
--- a/blocks/saveAPI/admin.py
+++ b/blocks/saveAPI/admin.py
@@ -27,9 +27,9 @@ class BookCategoryAdmin(admin.ModelAdmin):
     list_display = ('id', 'category_name')
     search_fields = ('category_name',)
 
+
 @admin.register(Book)
 class BookAdmin(admin.ModelAdmin):
     list_display = ('id', 'book_name', 'category')
     search_fields = ('book_name', 'category__category_name')
     list_filter = ('category',)
-
diff --git a/blocks/saveAPI/models.py b/blocks/saveAPI/models.py
index 2fbc97b5..c2ce90e8 100644
--- a/blocks/saveAPI/models.py
+++ b/blocks/saveAPI/models.py
@@ -58,7 +58,7 @@ class Gallery(models.Model):
 
     def __str__(self):
         return self.name
-    
+
 
 class BookCategory(models.Model):
     id = models.AutoField(primary_key=True)
@@ -66,7 +66,7 @@ class BookCategory(models.Model):
 
     def __str__(self):
         return self.category_name
-    
+
 
 class Book(models.Model):
     id = models.AutoField(primary_key=True)
diff --git a/blocks/saveAPI/serializers.py b/blocks/saveAPI/serializers.py
index 68936ac8..1ef83a6e 100644
--- a/blocks/saveAPI/serializers.py
+++ b/blocks/saveAPI/serializers.py
@@ -74,13 +74,14 @@ class GallerySerializer(serializers.ModelSerializer):
                   'media',
                   'shared',
                   )
-        
+
 
 class BookCategorySerializer(serializers.ModelSerializer):
     class Meta:
         model = BookCategory
         fields = ['id', 'category_name']
 
+
 class BookSerializer(serializers.ModelSerializer):
     class Meta:
         model = Book
diff --git a/blocks/saveAPI/views.py b/blocks/saveAPI/views.py
index 338dfa16..7c788e27 100644
--- a/blocks/saveAPI/views.py
+++ b/blocks/saveAPI/views.py
@@ -14,7 +14,7 @@ from .models import Gallery, StateSave, BookCategory, Book
 from .serializers import Base64ImageField, GallerySerializer, \
     SaveListSerializer, StateSaveSerializer, BookCategorySerializer, \
     BookSerializer
-    
+
 from django.db.models import OuterRef, Subquery
 
 logger = logging.getLogger(__name__)
@@ -458,7 +458,7 @@ class GalleryFetchSaveDeleteView(APIView):
             return Response({'done': True})
         except Exception:
             return Response(status=status.HTTP_500_INTERNAL_SERVER_ERROR)
-        
+
 
 class BookCategoryView(APIView):
     permission_classes = (AllowAny,)
@@ -471,7 +471,7 @@ class BookCategoryView(APIView):
             return Response(serialized.data, status=status.HTTP_200_OK)
         except Exception as e:
             return Response({'error': str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
-        
+
 
 class BookView(APIView):
     permission_classes = (AllowAny,)