Skip to content

Commit ce05114

Browse files
thang-qtthang-qt
committed
Rename to Readn
1 parent facf8d4 commit ce05114

40 files changed

+116
-118
lines changed

‎cmd/feed2json/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"os"
1010
"strings"
1111

12-
"github.com/nkanaev/yarr/src/parser"
12+
"github.com/thangisme/reedn/src/parser"
1313
)
1414

1515
func main() {

‎cmd/readability/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"os"
99
"strings"
1010

11-
"github.com/nkanaev/yarr/src/content/readability"
11+
"github.com/thangisme/reedn/src/content/readability"
1212
)
1313

1414
func main() {

‎cmd/yarr/main.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"path/filepath"
1111
"strings"
1212

13-
"github.com/nkanaev/yarr/src/platform"
14-
"github.com/nkanaev/yarr/src/server"
15-
"github.com/nkanaev/yarr/src/storage"
16-
"github.com/nkanaev/yarr/src/worker"
13+
"github.com/thangisme/reedn/src/platform"
14+
"github.com/thangisme/reedn/src/server"
15+
"github.com/thangisme/reedn/src/storage"
16+
"github.com/thangisme/reedn/src/worker"
1717
)
1818

1919
var Version string = "0.0"
@@ -61,14 +61,14 @@ func main() {
6161
fmt.Fprintln(out, " ", strings.Join(OptList, ", "))
6262
}
6363

64-
flag.StringVar(&addr, "addr", opt("YARR_ADDR", "127.0.0.1:7070"), "address to run server on")
65-
flag.StringVar(&basepath, "base", opt("YARR_BASE", ""), "base path of the service url")
66-
flag.StringVar(&authfile, "auth-file", opt("YARR_AUTHFILE", ""), "`path` to a file containing username:password. Takes precedence over --auth (or YARR_AUTH)")
67-
flag.StringVar(&auth, "auth", opt("YARR_AUTH", ""), "string with username and password in the format `username:password`")
68-
flag.StringVar(&certfile, "cert-file", opt("YARR_CERTFILE", ""), "`path` to cert file for https")
69-
flag.StringVar(&keyfile, "key-file", opt("YARR_KEYFILE", ""), "`path` to key file for https")
70-
flag.StringVar(&db, "db", opt("YARR_DB", ""), "storage file `path`")
71-
flag.StringVar(&logfile, "log-file", opt("YARR_LOGFILE", ""), "`path` to log file to use instead of stdout")
64+
flag.StringVar(&addr, "addr", opt("REEDN_ADDR", "127.0.0.1:7070"), "address to run server on")
65+
flag.StringVar(&basepath, "base", opt("REEDN_BASE", ""), "base path of the service url")
66+
flag.StringVar(&authfile, "auth-file", opt("REEDN_AUTHFILE", ""), "`path` to a file containing username:password. Takes precedence over --auth (or REEDN_AUTH)")
67+
flag.StringVar(&auth, "auth", opt("REEDN_AUTH", ""), "string with username and password in the format `username:password`")
68+
flag.StringVar(&certfile, "cert-file", opt("REEDN_CERTFILE", ""), "`path` to cert file for https")
69+
flag.StringVar(&keyfile, "key-file", opt("REEDN_KEYFILE", ""), "`path` to key file for https")
70+
flag.StringVar(&db, "db", opt("REEDN_DB", ""), "storage file `path`")
71+
flag.StringVar(&logfile, "log-file", opt("REEDN_LOGFILE", ""), "`path` to log file to use instead of stdout")
7272
flag.BoolVar(&ver, "version", false, "print application version")
7373
flag.BoolVar(&open, "open", false, "open the server in browser")
7474
flag.Parse()
@@ -100,7 +100,7 @@ func main() {
100100
log.Fatal("Failed to get config dir: ", err)
101101
}
102102

103-
storagePath := filepath.Join(configPath, "yarr")
103+
storagePath := filepath.Join(configPath, "reedn")
104104
if err := os.MkdirAll(storagePath, 0755); err != nil {
105105
log.Fatal("Failed to create app config dir: ", err)
106106
}

‎etc/dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
88

99
FROM alpine:latest
1010
RUN apk add --no-cache ca-certificates && update-ca-certificates
11-
COPY --from=build /src/out/yarr /usr/local/bin/yarr
11+
COPY --from=build /src/out/reedn /usr/local/bin/reedn
1212
EXPOSE 7070
13-
ENTRYPOINT ["/usr/local/bin/yarr"]
14-
CMD ["-addr", "0.0.0.0:7070", "-db", "/data/yarr.db"]
13+
ENTRYPOINT ["/usr/local/bin/reedn"]
14+
CMD ["-addr", "0.0.0.0:7070", "-db", "/data/reedn.db"]

‎etc/dockerfile.arm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ RUN env \
2727
CC=aarch64-linux-gnu-gcc \
2828
CGO_ENABLED=1 \
2929
GOOS=linux GOARCH=arm64 \
30-
make host && mv out/yarr /root/out/yarr.arm64
30+
make host && mv out/reedn /root/out/reedn.arm64
3131

3232
RUN env \
3333
CC=arm-linux-gnueabihf-gcc \
3434
CGO_ENABLED=1 \
3535
GOOS=linux GOARCH=arm GOARM=7 \
36-
make host && mv out/yarr /root/out/yarr.armv7
36+
make host && mv out/reedn /root/out/reedn.armv7
3737

3838
CMD ["/bin/bash"]

‎etc/install-linux.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ if [[ ! -d "$HOME/.local/share/applications" ]]; then
44
mkdir -p "$HOME/.local/share/applications"
55
fi
66

7-
cat >"$HOME/.local/share/applications/yarr.desktop" <<END
7+
cat >"$HOME/.local/share/applications/reedn.desktop" <<END
88
[Desktop Entry]
9-
Name=yarr
10-
Exec=$HOME/.local/bin/yarr -open
11-
Icon=yarr
9+
Name=Reedn
10+
Exec=$HOME/.local/bin/reedn -open
11+
Icon=reedn
1212
Type=Application
1313
Categories=Internet;
1414
END
@@ -17,7 +17,7 @@ if [[ ! -d "$HOME/.local/share/icons" ]]; then
1717
mkdir -p "$HOME/.local/share/icons"
1818
fi
1919

20-
cat >"$HOME/.local/share/icons/yarr.svg" <<END
20+
cat >"$HOME/.local/share/icons/reedn.svg" <<END
2121
<?xml version="1.0" encoding="UTF-8"?>
2222
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-anchor-favicon">
2323
<circle cx="12" cy="5" r="3" stroke-width="4" stroke="#ffffff"></circle>

‎etc/macos_package.sh‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,32 +16,32 @@ ICNFILE=$2
1616
BINFILE=$3
1717
OUTPATH=$4
1818

19-
mkdir -p $OUTPATH/yarr.app/Contents/MacOS
20-
mkdir -p $OUTPATH/yarr.app/Contents/Resources
19+
mkdir -p $OUTPATH/reedn.app/Contents/MacOS
20+
mkdir -p $OUTPATH/reedn.app/Contents/Resources
2121

22-
mv $BINFILE $OUTPATH/yarr.app/Contents/MacOS/yarr
23-
cp $ICNFILE $OUTPATH/yarr.app/Contents/Resources/icon.icns
22+
mv $BINFILE $OUTPATH/reedn.app/Contents/MacOS/reedn
23+
cp $ICNFILE $OUTPATH/reedn.app/Contents/Resources/icon.icns
2424

25-
chmod u+x $OUTPATH/yarr.app/Contents/MacOS/yarr
25+
chmod u+x $OUTPATH/reedn.app/Contents/MacOS/reedn
2626

27-
echo -n 'APPL????' >$OUTPATH/yarr.app/Contents/PkgInfo
28-
cat <<EOF >$OUTPATH/yarr.app/Contents/Info.plist
27+
echo -n 'APPL????' >$OUTPATH/reedn.app/Contents/PkgInfo
28+
cat <<EOF >$OUTPATH/reedn.app/Contents/Info.plist
2929
<?xml version="1.0" encoding="UTF-8"?>
3030
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3131
<plist version="1.0">
3232
<dict>
3333
<key>CFBundleName</key>
34-
<string>yarr</string>
34+
<string>Reedn</string>
3535
<key>CFBundleDisplayName</key>
36-
<string>yarr</string>
36+
<string>Reedn</string>
3737
<key>CFBundleIdentifier</key>
38-
<string>nkanaev.yarr</string>
38+
<string>thangisme.reedn</string>
3939
<key>CFBundleVersion</key>
4040
<string>$VERSION</string>
4141
<key>CFBundlePackageType</key>
4242
<string>APPL</string>
4343
<key>CFBundleExecutable</key>
44-
<string>yarr</string>
44+
<string>reedn</string>
4545
4646
<key>CFBundleIconFile</key>
4747
<string>icon</string>
@@ -56,7 +56,7 @@ cat <<EOF >$OUTPATH/yarr.app/Contents/Info.plist
5656
<key>LSUIElement</key>
5757
<true/>
5858
<key>NSHumanReadableCopyright</key>
59-
<string>Copyright © 2020 nkanaev. All rights reserved.</string>
59+
<string>Copyright © 2024 thangisme. All rights reserved.</string>
6060
</dict>
6161
</plist>
6262
EOF

‎etc/windows_versioninfo.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ BEGIN
6565
BLOCK "080904E4"
6666
BEGIN
6767
VALUE "CompanyName", "Old MacDonald's Farm"
68-
VALUE "FileDescription", "Yet another RSS reader"
68+
VALUE "FileDescription", "Reedn RSS Reader"
6969
VALUE "FileVersion", "$version"
70-
VALUE "InternalName", "yarr"
71-
VALUE "LegalCopyright", "nkanaev"
72-
VALUE "OriginalFilename", "yarr.exe"
73-
VALUE "ProductName", "yarr"
70+
VALUE "InternalName", "reedn"
71+
VALUE "LegalCopyright", "thangisme"
72+
VALUE "OriginalFilename", "reedn.exe"
73+
VALUE "ProductName", "Reedn"
7474
VALUE "ProductVersion", "$version"
7575
END
7676
END

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/nkanaev/yarr
1+
module github.com/thangisme/reedn
22

33
go 1.23.0
44

‎makefile‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,47 +32,47 @@ src/platform/versioninfo.rc:
3232
# build targets
3333

3434
host:
35-
go build $(GO_FLAGS) -o out/yarr ./cmd/yarr
35+
go build $(GO_FLAGS) -o out/reedn ./cmd/yarr
3636

3737
darwin_amd64:
3838
# cross-compilation not supported: CC="zig cc -target x86_64-macos-none"
39-
GOOS=darwin GOARCH=arm64 go build $(GO_FLAGS) -o out/$@/yarr ./cmd/yarr
39+
GOOS=darwin GOARCH=arm64 go build $(GO_FLAGS) -o out/$@/reedn ./cmd/yarr
4040

4141
darwin_arm64:
4242
# cross-compilation not supported: CC="zig cc -target aarch64-macos-none"
43-
GOOS=darwin GOARCH=arm64 go build $(GO_FLAGS) -o out/$@/yarr ./cmd/yarr
43+
GOOS=darwin GOARCH=arm64 go build $(GO_FLAGS) -o out/$@/reedn ./cmd/yarr
4444

4545
linux_amd64:
4646
CC="zig cc -target x86_64-linux-musl -O2 -g0" CGO_CFLAGS="-D_LARGEFILE64_SOURCE" GOOS=linux GOARCH=amd64 \
47-
go build $(GO_FLAGS) -o out/$@/yarr ./cmd/yarr
47+
go build $(GO_FLAGS) -o out/$@/reedn ./cmd/yarr
4848

4949
linux_arm64:
5050
CC="zig cc -target aarch64-linux-musl -O2 -g0" CGO_CFLAGS="-D_LARGEFILE64_SOURCE" GOOS=linux GOARCH=arm64 \
51-
go build $(GO_FLAGS) -o out/$@/yarr ./cmd/yarr
51+
go build $(GO_FLAGS) -o out/$@/reedn ./cmd/yarr
5252

5353
linux_armv7:
5454
CC="zig cc -target arm-linux-musleabihf -O2 -g0" CGO_CFLAGS="-D_LARGEFILE64_SOURCE" GOOS=linux GOARCH=arm GOARM=7 \
55-
go build $(GO_FLAGS) -o out/$@/yarr ./cmd/yarr
55+
go build $(GO_FLAGS) -o out/$@/reedn ./cmd/yarr
5656

5757
windows_amd64:
58-
CC="zig cc -target x86_64-windows-gnu" GOOS=windows GOARCH=amd64 go build $(GO_FLAGS) -o out/$@/yarr ./cmd/yarr
58+
CC="zig cc -target x86_64-windows-gnu" GOOS=windows GOARCH=amd64 go build $(GO_FLAGS) -o out/$@/reedn ./cmd/yarr
5959

6060
windows_arm64:
61-
CC="zig cc -target aarch64-windows-gnu" GOOS=windows GOARCH=arm64 go build $(GO_FLAGS) -o out/$@/yarr ./cmd/yarr
61+
CC="zig cc -target aarch64-windows-gnu" GOOS=windows GOARCH=arm64 go build $(GO_FLAGS) -o out/$@/reedn ./cmd/yarr
6262

6363
darwin_arm64_gui: etc/icon.icns
64-
GOOS=darwin GOARCH=arm64 go build $(GO_FLAGS_GUI) -o out/$@/yarr ./cmd/yarr
65-
./etc/macos_package.sh $(VERSION) etc/icon.icns out/$@/yarr out/$@
64+
GOOS=darwin GOARCH=arm64 go build $(GO_FLAGS_GUI) -o out/$@/reedn ./cmd/yarr
65+
./etc/macos_package.sh $(VERSION) etc/icon.icns out/$@/reedn out/$@
6666

6767
darwin_amd64_gui: etc/icon.icns
68-
GOOS=darwin GOARCH=amd64 go build $(GO_FLAGS_GUI) -o out/$@/yarr ./cmd/yarr
69-
./etc/macos_package.sh $(VERSION) etc/icon.icns out/$@/yarr out/$@
68+
GOOS=darwin GOARCH=amd64 go build $(GO_FLAGS_GUI) -o out/$@/reedn ./cmd/yarr
69+
./etc/macos_package.sh $(VERSION) etc/icon.icns out/$@/reedn out/$@
7070

7171
windows_amd64_gui: src/platform/versioninfo.rc
72-
GOOS=windows GOARCH=amd64 go build $(GO_FLAGS_GUI_WIN) -o out/$@/yarr.exe ./cmd/yarr
72+
GOOS=windows GOARCH=amd64 go build $(GO_FLAGS_GUI_WIN) -o out/$@/reedn.exe ./cmd/yarr
7373

7474
windows_arm64_gui: src/platform/versioninfo.rc
75-
GOOS=windows GOARCH=arm64 go build $(GO_FLAGS_GUI_WIN) -o out/$@/yarr.exe ./cmd/yarr
75+
GOOS=windows GOARCH=arm64 go build $(GO_FLAGS_GUI_WIN) -o out/$@/reedn.exe ./cmd/yarr
7676

7777
serve:
7878
go run $(GO_FLAGS) ./cmd/yarr -db local.db

0 commit comments

Comments
 (0)