v2 of metadata. unique upload forms, add to highlights, better ajax d…

…isplay, no more URL building.
LuxorLabs · Oct 29, 2015 · 638da3c · 638da3c
1 parent 6be1170
commit 638da3c
Show file tree

Hide file tree

Showing 10 changed files with 240 additions and 145 deletions.
diff --git a/blockexplorer/urls.py b/blockexplorer/urls.py
@@ -41,7 +41,9 @@
     url(r'^(?P<coin_symbol>[-\w]+)/pushtx/$', 'transactions.views.push_tx', name='push_tx'),
     url(r'^(?P<coin_symbol>[-\w]+)/decodetx/$', 'transactions.views.decode_tx', name='decode_tx'),
     url(r'^(?P<coin_symbol>[-\w]+)/embed-data/$', 'transactions.views.embed_txdata', name='embed_txdata'),
-    url(r'^(?P<coin_symbol>[-\w]+)/metadata/$', 'metadata.views.add_metadata', name='add_metadata'),
+    url(r'^(?P<coin_symbol>[-\w]+)/metadata/address/(?P<address>[-\w]+)/$', 'metadata.views.add_metadata_to_address', name='add_metadata_to_address'),
+    url(r'^(?P<coin_symbol>[-\w]+)/metadata/tx/(?P<tx_hash>[-\w]+)/$', 'metadata.views.add_metadata_to_tx', name='add_metadata_to_tx'),
+    url(r'^(?P<coin_symbol>[-\w]+)/metadata/block/(?P<block_hash>[-\w]+)/$', 'metadata.views.add_metadata_to_block', name='add_metadata_to_block'),
     url(r'^highlights/$', 'homepage.views.highlights', name='highlights'),
     # AJAX calls
     url(r'^(?P<coin_symbol>[-\w]+)/tx-confidence/(?P<tx_hash>[-\w]+)/$', 'transactions.views.poll_confidence', name='poll_confidence'),
@@ -61,6 +63,7 @@
     url(r'^decodetx/$', 'transactions.views.decodetx_forwarding', name='decodetx_forwarding'),
     url(r'^embed-data/$', 'transactions.views.embed_txdata_forwarding', name='embed_txdata_forwarding'),
     url(r'^metadata/$', 'metadata.views.metadata_forwarding', name='metadata_forwarding'),
+    url(r'^(?P<coin_symbol>[-\w]+)/metadata/$', 'metadata.views.add_metadata', name='add_metadata'),
     url(r'^latest-block/$', 'blocks.views.latest_block_forwarding', name='latest_block_forwarding'),
     url(r'^(?P<coin_symbol>[-\w]+)/latest-block/$', 'blocks.views.latest_block', name='latest_block'),
     url(r'^latest-unconfirmed-tx/$', 'transactions.views.latest_unconfirmed_tx_forwarding', name='latest_unconfirmed_tx_forwarding'),

diff --git a/metadata/forms.py b/metadata/forms.py
@@ -3,14 +3,9 @@
 
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Layout, Submit
-from crispy_forms.bootstrap import InlineRadios
 
 
-from blockcypher.constants import COIN_CHOICES, COIN_SYMBOL_MAPPINGS
-from blockcypher.utils import is_valid_address_for_coinsymbol, is_valid_hash
-
-
-class MetadataForm(forms.Form):
+class BaseMetadataForm(forms.Form):
     '''
     Used for uploading public metadata
     '''
@@ -31,74 +26,16 @@ class MetadataForm(forms.Form):
         max_length=512,
         )
 
-    where_to_upload = forms.ChoiceField(
-        label=_('Upload Type'),
-        required=True,
-        choices=(
-            ('address', 'Address'),
-            ('transaction', 'Transaction Hash'),
-            ('block', 'Block Hash'),
-            ),
-        widget=forms.RadioSelect,
-        initial='address',
-        help_text=_('You can upload metadata to an address, transaction or block'),
-        )
-
-    upload_string = forms.CharField(
-        label=_('Upload Type Value'),
-        required=True,
-        # TODO: adjust placeholder based on which coin-symbol is selected.
-        # Also, adjust if not address is toggled
-        widget=forms.TextInput(attrs={'class': 'input-lg', 'placeholder': '1AddressHere'}),
-        min_length=1,
-        max_length=256,
-        help_text='Address, Tranasaction Hash, or Block Hash to Upload To',
-        )
-
-    coin_symbol = forms.ChoiceField(
-        label=_('Network'),
-        required=True,
-        choices=COIN_CHOICES,
-        help_text=_('Currently only the Bitcoin Mainnet and Blockcypher Testnets are supported'),
-        )
-
-    def clean(self):
-        where_to_upload = self.cleaned_data.get('where_to_upload')
-        upload_string = self.cleaned_data.get('upload_string')
-        coin_symbol = self.cleaned_data.get('coin_symbol')
-        if not where_to_upload or not upload_string:
-            return self.cleaned_data
-        if where_to_upload == 'address':
-            if not is_valid_address_for_coinsymbol(upload_string, coin_symbol):
-                cs_display = COIN_SYMBOL_MAPPINGS[coin_symbol]['display_name']
-                msg = _("Sorry, that's not a valid address for %(coin_symbol)s" % {'coin_symbol': cs_display})
-                raise forms.ValidationError(msg)
-        elif where_to_upload == 'transaction':
-            if not is_valid_hash(upload_string):
-                msg = _("Sorry, that's not a valid transaction hash")
-                raise forms.ValidationError(msg)
-        elif where_to_upload == 'block':
-            if not is_valid_hash(upload_string):
-                msg = _("Sorry, that's not a valid block hash")
-                raise forms.ValidationError(msg)
-        else:
-            raise Exception('Logic Fail: Not Possible')
-
-        return self.cleaned_data
-
     def __init__(self, *args, **kwargs):
         self.helper = FormHelper()
         self.helper.form_method = 'post'
         self.helper.layout = Layout(
                 'metadata_key',
                 'metadata_value',
-                InlineRadios('where_to_upload'),
-                'upload_string',
-                'coin_symbol',
                 Submit(
                     'submit',
                     'Upload Metadata',
                     css_class='btn btn-primary btn-lg',
                     ),
                 )
-        super(MetadataForm, self).__init__(*args, **kwargs)
+        super(BaseMetadataForm, self).__init__(*args, **kwargs)