back round 0 view raw

appview/strings: allow extensionless filenames #516

merged

opened by

harperandrews.org 3 months ago targeting master from [deleted fork]: allow-extensionless-strings

Signed-off-by: ItsHarper git-f4cbe@harperandrews.org

options

unified split

Changed files

+2 -21

appview

strings.go

pages

templates

strings

fragments

form.html

strings

strings.go

+1 -9

appview/db/strings.go

···

       50
       50
        
       func (s String) Validate() error {

     

       51
       51
        
       	var err error

     

       52
       52
        
       

     

       53
       53
       -
       	if !strings.Contains(s.Filename, ".") {

     

       54
       54
       -
       		err = errors.Join(err, fmt.Errorf("missing filename extension"))

     

       55
       55
       -
       	}

     

       56
       56
       -
       

     

       57
       57
       -
       	if strings.HasSuffix(s.Filename, ".") {

     

       58
       58
       -
       		err = errors.Join(err, fmt.Errorf("filename ends with `.`"))

     

       59
       59
       -
       	}

     

       60
       60
       -
       

     

       61
       53
        
       	if utf8.RuneCountInString(s.Filename) > 140 {

     

       62
       54
        
       		err = errors.Join(err, fmt.Errorf("filename too long"))

     

       63
       55
        
       	}

     
···

       113
       105
        
       			filename = excluded.filename,

     

       114
       106
        
       			description = excluded.description,

     

       115
       107
        
       			content = excluded.content,

     

       116
       116
       -
       			edited = case 

     

       108
       108
       +
       			edited = case

     

       117
       109
        
       				when

     

       118
       110
        
       					strings.content != excluded.content

     

       119
       111
        
       					or strings.filename != excluded.filename

+1 -1

appview/pages/templates/strings/fragments/form.html

···

       13
       13
        
               type="text"

     

       14
       14
        
               id="filename"

     

       15
       15
        
               name="filename"

     

       16
       16
       -
               placeholder="Filename with extension"

     

       16
       16
       +
               placeholder="Filename"

     

       17
       17
        
               required

     

       18
       18
        
               value="{{ .String.Filename }}"

     

       19
       19
        
               class="md:max-w-64 dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:placeholder-gray-400 px-3 py-2 border rounded"

-11

appview/strings/strings.go

···

       7
       7
        
       	"path"

     

       8
       8
        
       	"slices"

     

       9
       9
        
       	"strconv"

     

       10
       10
       -
       	"strings"

     

       11
       10
        
       	"time"

     

       12
       11
        
       

     

       13
       12
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     
···

       288
       287
        
       			fail("Empty filename.", nil)

     

       289
       288
        
       			return

     

       290
       289
        
       		}

     

       291
       291
       -
       		if !strings.Contains(filename, ".") {

     

       292
       292
       -
       			// TODO: make this a htmx form validation

     

       293
       293
       -
       			fail("No extension provided for filename.", nil)

     

       294
       294
       -
       			return

     

       295
       295
       -
       		}

     

       296
       290
        
       

     

       297
       291
        
       		content := r.FormValue("content")

     

       298
       292
        
       		if content == "" {

     
···

       375
       369
        
       			fail("Empty filename.", nil)

     

       376
       370
        
       			return

     

       377
       371
        
       		}

     

       378
       378
       -
       		if !strings.Contains(filename, ".") {

     

       379
       379
       -
       			// TODO: make this a htmx form validation

     

       380
       380
       -
       			fail("No extension provided for filename.", nil)

     

       381
       381
       -
       			return

     

       382
       382
       -
       		}

     

       383
       372
        
       

     

       384
       373
        
       		content := r.FormValue("content")

     

       385
       374
        
       		if content == "" {