Skip to content

Commit 4ccbcdd

Browse files
authored
Merge pull request #5 from sqlrsync/matt
Matt
2 parents 02ca2ca + 01a8b91 commit 4ccbcdd

File tree

11 files changed

+3022
-634
lines changed

11 files changed

+3022
-634
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
arch: arm64
2121
- os: linux
2222
runs-on: ubuntu-latest
23-
arch: amd64
23+
arch: x86_64
2424

2525
steps:
2626
- name: Checkout code
@@ -96,8 +96,8 @@ jobs:
9696
echo "GOARCH=amd64" >> $GITHUB_ENV
9797
echo "CGO_ENABLED=1" >> $GITHUB_ENV
9898
99-
- name: Set build environment (Linux)
100-
if: matrix.os == 'linux'
99+
- name: Set build environment (Linux x86_64)
100+
if: matrix.os == 'linux' && matrix.arch == 'x86_64'
101101
run: |
102102
echo "GOOS=linux" >> $GITHUB_ENV
103103
echo "GOARCH=amd64" >> $GITHUB_ENV
@@ -161,7 +161,7 @@ jobs:
161161
uses: softprops/action-gh-release@v1
162162
with:
163163
files: |
164-
sqlrsync-linux-amd64/sqlrsync-linux-amd64
164+
sqlrsync-linux-x86_64/sqlrsync-linux-x86_64
165165
sqlrsync-darwin-amd64/sqlrsync-darwin-amd64
166166
sqlrsync-darwin-arm64/sqlrsync-darwin-arm64
167167
sqlrsync-windows-amd64/sqlrsync-windows-amd64.exe

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@ CLAUDE.md
1313
**/CLAUDE.md
1414

1515
tmp/
16+
client/sqlrsync
17+
client/sqlrsync
18+
client/sqlrsync_simple

bridge/client.go

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,15 @@ func (c *Client) GetDatabaseInfo() (*DatabaseInfo, error) {
7373
func (c *Client) RunPushSync(readFunc ReadFunc, writeFunc WriteFunc) error {
7474
c.Logger.Info("Starting origin sync", zap.String("database", c.Config.DatabasePath))
7575

76+
if c.Config.DryRun {
77+
fmt.Println("Running in dry-run mode")
78+
return nil
79+
}
80+
7681
// Store I/O functions for callbacks
7782
c.ReadFunc = readFunc
7883
c.WriteFunc = writeFunc
7984

80-
if c.Config.DryRun {
81-
c.Logger.Info("Running in dry-run mode")
82-
}
83-
8485
c.Logger.Debug("Calling C sqlite_rsync_run_origin")
8586

8687
// Run the origin synchronization via CGO bridge
@@ -102,7 +103,8 @@ func (c *Client) RunPullSync(readFunc ReadFunc, writeFunc WriteFunc) error {
102103
c.WriteFunc = writeFunc
103104

104105
if c.Config.DryRun {
105-
c.Logger.Info("Running in dry-run mode")
106+
fmt.Println("Running in dry-run mode. We should not have gotten here.")
107+
return nil
106108
}
107109

108110
c.Logger.Debug("Calling C sqlite_rsync_run_replica")
@@ -120,12 +122,13 @@ func (c *Client) RunPullSync(readFunc ReadFunc, writeFunc WriteFunc) error {
120122

121123
// RunDirectSync runs direct local synchronization between two SQLite files
122124
func (c *Client) RunDirectSync(replicaPath string) error {
123-
c.Logger.Info("Starting direct local sync",
125+
c.Logger.Info("Starting direct local sync",
124126
zap.String("origin", c.Config.DatabasePath),
125127
zap.String("replica", replicaPath))
126128

127129
if c.Config.DryRun {
128-
c.Logger.Info("Running in dry-run mode")
130+
fmt.Println("Running in dry-run mode. We should not have gotten here.")
131+
return nil
129132
}
130133

131134
verboseLevel := 0

0 commit comments

Comments
 (0)