Merge pull request #177 from chriskuehl/use-same-filename-for-pastes

Use same filename for TXT and HTML for pastes

Makefile

@@ -48,7 +48,7 @@ dev: $(VENV) fluffy/static/app.css
 test: $(VENV)
 	$(BIN)/coverage erase
 	COVERAGE_PROCESS_START=$(CURDIR)/.coveragerc \
-		$(BIN)/py.test -vv tests/
+		$(BIN)/py.test --tb=native -vv tests/
 	$(BIN)/coverage combine
 	$(BIN)/coverage report
 

fluffy/models.py

@@ -87,7 +87,7 @@ def __new__(cls, *args, **kwargs):
 
     @classmethod
     @contextmanager
-    def from_http_file(cls, f):
+    def from_http_file(cls, f, unique_id: str | None = None):
         with tempfile.NamedTemporaryFile() as tf:
             # We don't know the file size until we start to save the file (the
             # client can lie about the uploaded size, and some browsers don't
@@ -102,12 +102,12 @@ def from_http_file(cls, f):
                 human_name=f.filename,
                 num_bytes=num_bytes,
                 open_file=tf,
-                unique_id=gen_unique_id(),
+                unique_id=unique_id or gen_unique_id(),
             )
 
     @classmethod
     @contextmanager
-    def from_text(cls, text, human_name='plaintext.txt'):
+    def from_text(cls, text, human_name='plaintext.txt', unique_id: str | None = None):
         with io.BytesIO(text.encode('utf8')) as open_file:
             num_bytes = len(text)
             if num_bytes > app.config['MAX_UPLOAD_SIZE']:
@@ -117,7 +117,7 @@ def from_text(cls, text, human_name='plaintext.txt'):
                 human_name=human_name,
                 num_bytes=num_bytes,
                 open_file=open_file,
-                unique_id=gen_unique_id(),
+                unique_id=unique_id or gen_unique_id(),
             )
 
     @cached_property
@@ -191,20 +191,20 @@ class HtmlToStore(
     namedtuple(
         'HtmlToStore',
         (
-            'name',
             'open_file',
+            'unique_id',
         ),
     ),
     ObjectToStore,
 ):
 
     @classmethod
     @contextmanager
-    def from_html(cls, html):
+    def from_html(cls, html, unique_id: str | None = None):
         with io.BytesIO(html.encode('utf8')) as open_file:
             yield cls(
-                name=gen_unique_id() + '.html',
                 open_file=open_file,
+                unique_id=unique_id or gen_unique_id(),
             )
 
     @property
@@ -216,6 +216,10 @@ def content_disposition_header(self):
         # inline => render as HTML as opposed to downloading the HTML
         return 'inline'
 
+    @cached_property
+    def name(self):
+        return f"{self.unique_id}.html"
+
     @cached_property
     def url(self):
         return app.config['HTML_URL'].format(name=self.name)

fluffy/views.py

@@ -94,6 +94,7 @@ def upload():
                                     raw_url=app.config['FILE_URL'].format(name=uf.name),
                                     styles=STYLES_BY_CATEGORY,
                                 ),
+                                unique_id=uf.unique_id,
                             ),
                         )
                         objects.append(pb)
@@ -219,6 +220,7 @@ def paste():
                         raw_url=app.config['FILE_URL'].format(name=uf.name),
                         styles=STYLES_BY_CATEGORY,
                     ),
+                    unique_id=uf.unique_id,
                 ),
             )
             objects.append(paste_obj)
@@ -232,6 +234,7 @@ def paste():
                         copy_and_edit_text=transformed_text,
                         raw_url=app.config['FILE_URL'].format(name=uf.name),
                     ),
+                    unique_id=uf.unique_id,
                 ),
             )
             objects.append(paste_obj)

tests/integration/paste_test.py

@@ -91,3 +91,7 @@ def test_simple_paste_json(running_server):
             },
         },
     }
+
+    # The paste's HTML view and raw view should have the same URL minus the extension.
+    details = req.json()['uploaded_files']['paste']
+    assert details['raw'].rsplit('/', 1)[1] == details['paste'].replace('.html', '.txt').rsplit('/', 1)[1]

tests/integration/upload_test.py

@@ -10,6 +10,7 @@
 from testing import FILE_CONTENT_TESTCASES
 from testing import paste_urls_from_details
 from testing import PLAINTEXT_TESTCASES
+from testing import raw_text_url_from_paste_html
 from testing import urls_from_details
 
 
@@ -112,6 +113,10 @@ def test_plaintext_files_are_also_pasted(content, running_server):
         content
     )
 
+    # The paste's HTML view and raw view should have the same URL minus the extension.
+    raw_url = raw_text_url_from_paste_html(req.text)
+    assert raw_url.rsplit('/', 1)[1] == url.replace('.html', '.bin').rsplit('/', 1)[1]
+
 
 @pytest.mark.parametrize('content', BINARY_TESTCASES)
 def test_binary_files_are_not_pasted(content, running_server):