From a064213dbdc31b64882606eca0fc62a6c4f4a8e1 Mon Sep 17 00:00:00 2001
From: Mantas-Skackauskas <smantaslt@gmail.com>
Date: Tue, 10 May 2022 14:20:28 +0100
Subject: [PATCH 1/4] modified requirements

---
 requirements-dev-minimal.txt | 1 +
 requirements-dev.txt         | 3 ++-
 requirements.txt             | 6 +-----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/requirements-dev-minimal.txt b/requirements-dev-minimal.txt
index b699af7..6d51ffe 100644
--- a/requirements-dev-minimal.txt
+++ b/requirements-dev-minimal.txt
@@ -5,6 +5,7 @@ ephemeral-port-reserve
 gunicorn
 libsass
 pre-commit>=1.0
+pysass
 pytest
 requests
 requirements-tools
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 21e0692..80894e0 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -26,13 +26,14 @@ pre-commit==2.18.1
 py==1.11.0
 pycparser==2.21
 pyparsing==3.0.8
+pysass==0.1.0
 pytest==7.1.1
 PyYAML==6.0
 readme-renderer==34.0
 requests-toolbelt==0.9.1
 requirements-tools==2.0.0
 rfc3986==2.0.0
-rich==12.2.0
+rich
 SecretStorage==3.3.1
 toml==0.10.2
 tomli==2.0.1
diff --git a/requirements.txt b/requirements.txt
index e68233b..9844851 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -40,6 +40,7 @@ Pygments==2.11.2
 pygments-ansi-color==0.0.6
 pygments-solarized-style==0.1
 pyquery==1.4.3
+pysass==0.1.0
 python-dateutil==2.8.2
 requests==2.27.1
 requests-oauthlib==1.3.1
@@ -47,11 +48,6 @@ rsa==4.8
 s3transfer==0.5.2
 setuptools==62.1.0
 six==1.15.0
-tensorboard==2.8.0
-tensorboard-data-server==0.6.1
-tensorboard-plugin-wit==1.8.1
-tensorflow==2.5.0
-tensorflow-estimator==2.5.0
 termcolor==1.1.0
 typing-extensions==3.7.4.3
 urllib3==1.26.9

From 67efddf5ebad4c62e03e0087b36579109459a3bb Mon Sep 17 00:00:00 2001
From: Mantas-Skackauskas <smantaslt@gmail.com>
Date: Wed, 11 May 2022 11:12:07 +0100
Subject: [PATCH 2/4] modified dev files for accessing them from the repo

---
 fluffy/component/backends.py | 2 +-
 settings/dev_files.py        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fluffy/component/backends.py b/fluffy/component/backends.py
index 28e88eb..1df1453 100644
--- a/fluffy/component/backends.py
+++ b/fluffy/component/backends.py
@@ -19,7 +19,7 @@ class FileBackend:
 
     def _store(self, path_key, obj):
         path = app.config['STORAGE_BACKEND'][path_key].format(name=obj.name)
-        with open(path, 'wb') as f:
+        with open(path, 'wb+') as f:
             shutil.copyfileobj(obj.open_file, f)
             obj.open_file.seek(0)
 
diff --git a/settings/dev_files.py b/settings/dev_files.py
index c9a6e1e..c0024a3 100644
--- a/settings/dev_files.py
+++ b/settings/dev_files.py
@@ -2,8 +2,8 @@
 # storage backend (how are the files stored after being uploaded?)
 STORAGE_BACKEND = {
     'name': 'file',
-    'object_path': 'tmp/object/{name}',
-    'html_path': 'tmp/html/{name}',
+    'object_path': '/Users/MantasSkackauskas/Documents/fluffy/tmp/object/{name}',
+    'html_path': '/Users/MantasSkackauskas/Documents/fluffy/tmp/html/{name}',
 }
 
 # branding

From 90cee134b7593eed47a33045425f6653aa85c343 Mon Sep 17 00:00:00 2001
From: Mantas-Skackauskas <smantaslt@gmail.com>
Date: Wed, 11 May 2022 13:37:14 +0100
Subject: [PATCH 3/4] attempt to get 2 screens for paste and paste output

---
 fluffy/templates/home.html  |  9 +++++----
 fluffy/templates/paste.html | 28 +++++++++++++++++++++-------
 fluffy/views.py             |  4 ++++
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/fluffy/templates/home.html b/fluffy/templates/home.html
index 83a072d..8cb012f 100644
--- a/fluffy/templates/home.html
+++ b/fluffy/templates/home.html
@@ -35,9 +35,10 @@
         <form class="pastebinForm" method="POST" action="/paste">
             <p class="switch-modes"><a>upload files instead</a></p>
 
-            <p>
-                <textarea id="text" name="text" placeholder="paste text here" required autofocus>{{text}}</textarea>
-            </p>
+            <div style="display:flex">
+                    <textarea id="text" name="text" placeholder="paste text here for document 1" required autofocus style="width:30%; flex:1; margin: 2px;">{{text}}</textarea>
+                    <textarea id="text" name="text2" placeholder="paste text here for document 2" required autofocus style="width:30%; flex:1; margin: 2px;">{{text2}}</textarea>
+            </div>
             <p>
                 <select name="language">
                     <option selected="selected" value="">Guess the language for me</option>
@@ -50,7 +51,7 @@
                     {% endfor %}
                 </select>
             </p>
-            <input class="pasteButton" id="paste" type="submit" value="Paste" />
+            <input class="pasteButton" id="paste" type="submit" value="Paste and compare" />
         </form>
 
         <div id="recent-uploads" class="hidden">
diff --git a/fluffy/templates/paste.html b/fluffy/templates/paste.html
index a8437a0..f0df6a3 100644
--- a/fluffy/templates/paste.html
+++ b/fluffy/templates/paste.html
@@ -31,13 +31,27 @@
 {% endblock %}
 
 {% block text %}
-    <div class="line-numbers">
-        {% for i in range(1, num_lines(text) + 1) %}
-            <a id="LL{{i}}">{{i}}</a>
-        {% endfor %}
-    </div>
-    <div class="text" contenteditable="true" spellcheck="false">
-        {{highlighter.highlight(text)|safe}}
+    <div style="display:flex;">
+        <div style="flex:1; width:30%;">
+            <div class="line-numbers" style=>
+                {% for i in range(1, num_lines(text) + 1) %}
+                    <a id="LL{{i}}">{{i}}</a>
+                {% endfor %}
+            </div>
+            <div class="text" contenteditable="true" spellcheck="false">
+                {{highlighter.highlight(text)|safe}}
+            </div>
+        </div>
+        <div style="flex:1; width:30%;">
+            <div class="line-numbers" style=>
+                {% for i in range(1, num_lines(text2) + 1) %}
+                    <a id="LL{{i}}">{{i}}</a>
+                {% endfor %}
+            </div>
+            <div class="text" contenteditable="true" spellcheck="false">
+                {{highlighter2.highlight(text2)|safe}}
+            </div>
+        </div>
     </div>
 {% endblock %}
 
diff --git a/fluffy/views.py b/fluffy/views.py
index 5b73c0b..29c32b6 100644
--- a/fluffy/views.py
+++ b/fluffy/views.py
@@ -135,6 +135,7 @@ def upload():
 def paste():
     """Paste and redirect."""
     text = request.form['text']
+    text2 = request.form['text2']
     # Browsers always send \r\n for the pasted text, which leads to bad
     # newlines when curling the raw text (#28).
     transformed_text = text.replace('\r\n', '\n')
@@ -157,13 +158,16 @@ def paste():
         lang = request.form['language']
         if lang != 'rendered-markdown':
             highlighter = get_highlighter(text, lang, None)
+            highlighter2 = get_highlighter(text2, lang, None)
             lang_title = highlighter.name
             paste_obj = ctx.enter_context(
                 HtmlToStore.from_html(
                     render_template(
                         'paste.html',
                         text=text,
+                        text2=text2,
                         highlighter=highlighter,
+                        highlighter2=highlighter2,
                         raw_url=app.config['FILE_URL'].format(name=uf.name),
                         styles=STYLES_BY_CATEGORY,
                     ),

From 6577161fe3102bd55f9ae50b57f8880e315fedb4 Mon Sep 17 00:00:00 2001
From: Mantas-Skackauskas <smantaslt@gmail.com>
Date: Thu, 12 May 2022 13:24:14 +0100
Subject: [PATCH 4/4] Improved Luana's implementation

---
 fluffy/component/highlighting.py | 19 +++++++++++++++++++
 fluffy/views.py                  | 10 ++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/fluffy/component/highlighting.py b/fluffy/component/highlighting.py
index 9a993b8..feba4f4 100644
--- a/fluffy/component/highlighting.py
+++ b/fluffy/component/highlighting.py
@@ -1,3 +1,4 @@
+import difflib
 import functools
 import re
 from collections import namedtuple
@@ -178,6 +179,24 @@ def get_highlighter(text, language, filename):
     return PygmentsHighlighter(lexer)
 
 
+def create_diff(text, text2):
+    """
+    The diff between two texts is calculated
+    """
+    delta = difflib.unified_diff(text.split('\n'), text2.split('\n'))
+    diff_lines = list(delta)
+    # if we find differences, we return them with the original code
+    # if not, we just return the original texts (otherwise we would get empty strings)
+    if diff_lines:
+        diff_lines = diff_lines[3:]
+        diff = '\n'.join((line if not line.startswith('+') else '') for line in diff_lines)
+        diff2 = '\n'.join((line if not line.startswith('-') else '') for line in diff_lines)
+        print(diff, diff2)
+        return diff, diff2
+    else:
+        return text, text2
+
+
 # All guesslang titles with available Pygments lexers match automatically
 # except for these exceptions.
 GUESSLANG_LANGUAGE_MAP = {
diff --git a/fluffy/views.py b/fluffy/views.py
index 29c32b6..161447b 100644
--- a/fluffy/views.py
+++ b/fluffy/views.py
@@ -10,6 +10,7 @@
 from fluffy import version
 from fluffy.app import app
 from fluffy.component.backends import get_backend
+from fluffy.component.highlighting import create_diff
 from fluffy.component.highlighting import get_highlighter
 from fluffy.component.highlighting import UI_LANGUAGES_MAP
 from fluffy.component.styles import STYLES_BY_CATEGORY
@@ -157,15 +158,16 @@ def paste():
         # HTML view (Markdown or paste)
         lang = request.form['language']
         if lang != 'rendered-markdown':
-            highlighter = get_highlighter(text, lang, None)
-            highlighter2 = get_highlighter(text2, lang, None)
+            diff, diff2 = create_diff(text, text2)
+            highlighter = get_highlighter(diff, lang, None)
+            highlighter2 = get_highlighter(diff2, lang, None)
             lang_title = highlighter.name
             paste_obj = ctx.enter_context(
                 HtmlToStore.from_html(
                     render_template(
                         'paste.html',
-                        text=text,
-                        text2=text2,
+                        text=diff,
+                        text2=diff2,
                         highlighter=highlighter,
                         highlighter2=highlighter2,
                         raw_url=app.config['FILE_URL'].format(name=uf.name),