patch of appview/db: add DB components for strings · round #0 · pull #411 · tangled.org/core

+15

appview/db/db.go

···

       443
        
       			created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now'))

     

       444
        
       		);

     

       445
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       446
        
       		create table if not exists migrations (

     

       447
        
       			id integer primary key autoincrement,

     

       448
        
       			name text unique

···

       443
        
       			created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now'))

     

       444
        
       		);

     

       445
        
       

     

       446
       +
       		create table if not exists strings (

     

       447
       +
       			-- identifiers

     

       448
       +
       			did text not null,

     

       449
       +
       			rkey text not null,

     

       450
       +
       

     

       451
       +
       			-- content

     

       452
       +
       			filename text not null,

     

       453
       +
       			description text,

     

       454
       +
       			content text not null,

     

       455
       +
       			created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),

     

       456
       +
       			edited text,

     

       457
       +
       

     

       458
       +
       			primary key (did, rkey)

     

       459
       +
       		);

     

       460
       +
       

     

       461
        
       		create table if not exists migrations (

     

       462
        
       			id integer primary key autoincrement,

     

       463
        
       			name text unique

+251

appview/db/strings.go

···

       1
       +
       package db

     

       2
       +
       

     

       3
       +
       import (

     

       4
       +
       	"bytes"

     

       5
       +
       	"database/sql"

     

       6
       +
       	"errors"

     

       7
       +
       	"fmt"

     

       8
       +
       	"io"

     

       9
       +
       	"strings"

     

       10
       +
       	"time"

     

       11
       +
       	"unicode/utf8"

     

       12
       +
       

     

       13
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       14
       +
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       15
       +
       )

     

       16
       +
       

     

       17
       +
       type String struct {

     

       18
       +
       	Did  syntax.DID

     

       19
       +
       	Rkey string

     

       20
       +
       

     

       21
       +
       	Filename    string

     

       22
       +
       	Description string

     

       23
       +
       	Contents    string

     

       24
       +
       	Created     time.Time

     

       25
       +
       	Edited      *time.Time

     

       26
       +
       }

     

       27
       +
       

     

       28
       +
       func (s *String) StringAt() syntax.ATURI {

     

       29
       +
       	return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", s.Did, tangled.StringNSID, s.Rkey))

     

       30
       +
       }

     

       31
       +
       

     

       32
       +
       type StringStats struct {

     

       33
       +
       	LineCount uint64

     

       34
       +
       	ByteCount uint64

     

       35
       +
       }

     

       36
       +
       

     

       37
       +
       func (s String) Stats() StringStats {

     

       38
       +
       	lineCount, err := countLines(strings.NewReader(s.Contents))

     

       39
       +
       	if err != nil {

     

       40
       +
       		// non-fatal

     

       41
       +
       		// TODO: log this?

     

       42
       +
       	}

     

       43
       +
       

     

       44
       +
       	return StringStats{

     

       45
       +
       		LineCount: uint64(lineCount),

     

       46
       +
       		ByteCount: uint64(len(s.Contents)),

     

       47
       +
       	}

     

       48
       +
       }

     

       49
       +
       

     

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

     

       51
       +
       	var err error

     

       52
       +
       

     

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

     

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

     

       55
       +
       	}

     

       56
       +
       

     

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

     

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

     

       59
       +
       	}

     

       60
       +
       

     

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

     

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

     

       63
       +
       	}

     

       64
       +
       

     

       65
       +
       	if utf8.RuneCountInString(s.Description) > 280 {

     

       66
       +
       		err = errors.Join(err, fmt.Errorf("description too long"))

     

       67
       +
       	}

     

       68
       +
       

     

       69
       +
       	if len(s.Contents) == 0 {

     

       70
       +
       		err = errors.Join(err, fmt.Errorf("contents is empty"))

     

       71
       +
       	}

     

       72
       +
       

     

       73
       +
       	return err

     

       74
       +
       }

     

       75
       +
       

     

       76
       +
       func (s *String) AsRecord() tangled.String {

     

       77
       +
       	return tangled.String{

     

       78
       +
       		Filename:    s.Filename,

     

       79
       +
       		Description: s.Description,

     

       80
       +
       		Contents:    s.Contents,

     

       81
       +
       		CreatedAt:   s.Created.Format(time.RFC3339),

     

       82
       +
       	}

     

       83
       +
       }

     

       84
       +
       

     

       85
       +
       func StringFromRecord(did, rkey string, record tangled.String) String {

     

       86
       +
       	created, err := time.Parse(record.CreatedAt, time.RFC3339)

     

       87
       +
       	if err != nil {

     

       88
       +
       		created = time.Now()

     

       89
       +
       	}

     

       90
       +
       	return String{

     

       91
       +
       		Did:         syntax.DID(did),

     

       92
       +
       		Rkey:        rkey,

     

       93
       +
       		Filename:    record.Filename,

     

       94
       +
       		Description: record.Description,

     

       95
       +
       		Contents:    record.Contents,

     

       96
       +
       		Created:     created,

     

       97
       +
       	}

     

       98
       +
       }

     

       99
       +
       

     

       100
       +
       func AddString(e Execer, s String) error {

     

       101
       +
       	_, err := e.Exec(

     

       102
       +
       		`insert into strings (

     

       103
       +
       			did,

     

       104
       +
       			rkey,

     

       105
       +
       			filename,

     

       106
       +
       			description,

     

       107
       +
       			content,

     

       108
       +
       			created,

     

       109
       +
       			edited

     

       110
       +
       		)

     

       111
       +
       		values (?, ?, ?, ?, ?, ?, null)

     

       112
       +
       		on conflict(did, rkey) do update set

     

       113
       +
       			filename = excluded.filename,

     

       114
       +
       			description = excluded.description,

     

       115
       +
       			content = excluded.content,

     

       116
       +
       			edited = case 

     

       117
       +
       				when

     

       118
       +
       					strings.content != excluded.content

     

       119
       +
       					or strings.filename != excluded.filename

     

       120
       +
       					or strings.description != excluded.description then ?

     

       121
       +
       				else strings.edited

     

       122
       +
       			end`,

     

       123
       +
       		s.Did,

     

       124
       +
       		s.Rkey,

     

       125
       +
       		s.Filename,

     

       126
       +
       		s.Description,

     

       127
       +
       		s.Contents,

     

       128
       +
       		s.Created.Format(time.RFC3339),

     

       129
       +
       		time.Now().Format(time.RFC3339),

     

       130
       +
       	)

     

       131
       +
       	return err

     

       132
       +
       }

     

       133
       +
       

     

       134
       +
       func GetStrings(e Execer, filters ...filter) ([]String, error) {

     

       135
       +
       	var all []String

     

       136
       +
       

     

       137
       +
       	var conditions []string

     

       138
       +
       	var args []any

     

       139
       +
       	for _, filter := range filters {

     

       140
       +
       		conditions = append(conditions, filter.Condition())

     

       141
       +
       		args = append(args, filter.Arg()...)

     

       142
       +
       	}

     

       143
       +
       

     

       144
       +
       	whereClause := ""

     

       145
       +
       	if conditions != nil {

     

       146
       +
       		whereClause = " where " + strings.Join(conditions, " and ")

     

       147
       +
       	}

     

       148
       +
       

     

       149
       +
       	query := fmt.Sprintf(`select

     

       150
       +
       			did,

     

       151
       +
       			rkey,

     

       152
       +
       			filename,

     

       153
       +
       			description,

     

       154
       +
       			content,

     

       155
       +
       			created,

     

       156
       +
       			edited

     

       157
       +
       		from strings %s`,

     

       158
       +
       		whereClause,

     

       159
       +
       	)

     

       160
       +
       

     

       161
       +
       	rows, err := e.Query(query, args...)

     

       162
       +
       

     

       163
       +
       	if err != nil {

     

       164
       +
       		return nil, err

     

       165
       +
       	}

     

       166
       +
       	defer rows.Close()

     

       167
       +
       

     

       168
       +
       	for rows.Next() {

     

       169
       +
       		var s String

     

       170
       +
       		var createdAt string

     

       171
       +
       		var editedAt sql.NullString

     

       172
       +
       

     

       173
       +
       		if err := rows.Scan(

     

       174
       +
       			&s.Did,

     

       175
       +
       			&s.Rkey,

     

       176
       +
       			&s.Filename,

     

       177
       +
       			&s.Description,

     

       178
       +
       			&s.Contents,

     

       179
       +
       			&createdAt,

     

       180
       +
       			&editedAt,

     

       181
       +
       		); err != nil {

     

       182
       +
       			return nil, err

     

       183
       +
       		}

     

       184
       +
       

     

       185
       +
       		s.Created, err = time.Parse(time.RFC3339, createdAt)

     

       186
       +
       		if err != nil {

     

       187
       +
       			s.Created = time.Now()

     

       188
       +
       		}

     

       189
       +
       

     

       190
       +
       		if editedAt.Valid {

     

       191
       +
       			e, err := time.Parse(time.RFC3339, editedAt.String)

     

       192
       +
       			if err != nil {

     

       193
       +
       				e = time.Now()

     

       194
       +
       			}

     

       195
       +
       			s.Edited = &e

     

       196
       +
       		}

     

       197
       +
       

     

       198
       +
       		all = append(all, s)

     

       199
       +
       	}

     

       200
       +
       

     

       201
       +
       	if err := rows.Err(); err != nil {

     

       202
       +
       		return nil, err

     

       203
       +
       	}

     

       204
       +
       

     

       205
       +
       	return all, nil

     

       206
       +
       }

     

       207
       +
       

     

       208
       +
       func DeleteString(e Execer, filters ...filter) error {

     

       209
       +
       	var conditions []string

     

       210
       +
       	var args []any

     

       211
       +
       	for _, filter := range filters {

     

       212
       +
       		conditions = append(conditions, filter.Condition())

     

       213
       +
       		args = append(args, filter.Arg()...)

     

       214
       +
       	}

     

       215
       +
       

     

       216
       +
       	whereClause := ""

     

       217
       +
       	if conditions != nil {

     

       218
       +
       		whereClause = " where " + strings.Join(conditions, " and ")

     

       219
       +
       	}

     

       220
       +
       

     

       221
       +
       	query := fmt.Sprintf(`delete from strings %s`, whereClause)

     

       222
       +
       

     

       223
       +
       	_, err := e.Exec(query, args...)

     

       224
       +
       	return err

     

       225
       +
       }

     

       226
       +
       

     

       227
       +
       func countLines(r io.Reader) (int, error) {

     

       228
       +
       	buf := make([]byte, 32*1024)

     

       229
       +
       	bufLen := 0

     

       230
       +
       	count := 0

     

       231
       +
       	nl := []byte{'\n'}

     

       232
       +
       

     

       233
       +
       	for {

     

       234
       +
       		c, err := r.Read(buf)

     

       235
       +
       		if c > 0 {

     

       236
       +
       			bufLen += c

     

       237
       +
       		}

     

       238
       +
       		count += bytes.Count(buf[:c], nl)

     

       239
       +
       

     

       240
       +
       		switch {

     

       241
       +
       		case err == io.EOF:

     

       242
       +
       			/* handle last line not having a newline at the end */

     

       243
       +
       			if bufLen >= 1 && buf[(bufLen-1)%(32*1024)] != '\n' {

     

       244
       +
       				count++

     

       245
       +
       			}

     

       246
       +
       			return count, nil

     

       247
       +
       		case err != nil:

     

       248
       +
       			return 0, err

     

       249
       +
       		}

     

       250
       +
       	}

     

       251
       +
       }