Merge e9676491ee into 3adcddc70c

.github/workflows/build-docker-image

@@ -1,38 +0,0 @@
-name: Publish Docker Image
-on:
-  push:
-    tags: [ 'v*.*.*', 'v*.*', 'v*', 'latest' ]
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: nkanaev/yarr
-jobs:
-  build-and-push-image:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a
-        with:
-          context: .
-          file: ./etc/dockerfile
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/build.yml

@@ -1,14 +1,8 @@
-name: Build
+name: build
 
 on:
   push:
-    tags:
-      - v*
-  workflow_dispatch:
-  workflow_run:
-    workflows: [Test]
-    types:
-      - completed
+    tags: ['v*', 'test*']
 
 jobs:
   build_macos:
@@ -24,7 +18,7 @@ jobs:
       with:
         go-version: '^1.17'
     - name: Cache Go Modules
-      uses: actions/cache@v4
+      uses: actions/cache@v2
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -33,7 +27,7 @@ jobs:
     - name: "Build"
       run: make build_macos
     - name: Upload
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
       with:
         name: macos
         path: _output/macos/yarr.app
@@ -51,7 +45,7 @@ jobs:
       with:
         go-version: '^1.17'
     - name: Cache Go Modules
-      uses: actions/cache@v4
+      uses: actions/cache@v2
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -60,7 +54,7 @@ jobs:
     - name: "Build"
       run: make build_windows
     - name: Upload
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
       with:
         name: windows
         path: _output/windows/yarr.exe
@@ -78,99 +72,38 @@ jobs:
       with:
         go-version: '^1.17'
     - name: Cache Go Modules
-      uses: actions/cache@v4
+      uses: actions/cache@v2
       with:
         path: ~/go/pkg/mod
-        key: ${{ runner.os }}-amd64-go-${{ hashFiles('**/go.sum') }}
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
         restore-keys: |
-          ${{ runner.os }}-go-amd64
+          ${{ runner.os }}-go-
     - name: "Build"
       run: make build_linux
     - name: Upload
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
       with:
         name: linux
         path: _output/linux/yarr
 
-  build_linux-arm:
-    name: Build for Linux ARM
-    runs-on: ubuntu-22.04
-    steps:
-    - name: Install dependencies
-      run: >
-        sudo apt-get install -y
-        gcc-arm-linux-gnueabihf
-        libc6-dev-armhf-cross
-    - name: "Checkout"
-      uses: actions/checkout@v2
-      with:
-        submodules: 'recursive'
-    - name: "Setup Go"
-      uses: actions/setup-go@v2
-      with:
-        go-version: '^1.17'
-    - name: Cache Go Modules
-      uses: actions/cache@v4
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-armv7-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: |
-          ${{ runner.os }}-go-armv7
-    - name: "Build"
-      env:
-        CC: arm-linux-gnueabihf-gcc
-        GOARCH: arm
-        GOARM: 7
-      run: make build_linux
-    - name: Upload
-      uses: actions/upload-artifact@v4
-      with:
-        name: linux_arm
-        path: _output/linux/yarr
-
-  build_linux-arm64:
-    name: Build for Linux ARM64
-    runs-on: ubuntu-22.04
-    steps:
-    - name: Install dependencies
-      run: >
-        sudo apt-get install -y
-        gcc-aarch64-linux-gnu
-        libc6-dev-arm64-cross
-    - name: "Checkout"
-      uses: actions/checkout@v2
-      with:
-        submodules: 'recursive'
-    - name: "Setup Go"
-      uses: actions/setup-go@v2
-      with:
-        go-version: '^1.17'
-    - name: Cache Go Modules
-      uses: actions/cache@v4
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-arm64-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: |
-          ${{ runner.os }}-go-arm64
-    - name: "Build"
-      env:
-        CC: aarch64-linux-gnu-gcc
-        GOARCH: arm64
-      run: make build_linux
-    - name: Upload
-      uses: actions/upload-artifact@v4
-      with:
-        name: linux_arm64
-        path: _output/linux/yarr
-
   create_release:
     name: Create Release
     runs-on: ubuntu-latest
-    if: ${{ startsWith(github.ref, 'refs/tags/') && !contains(github.ref, 'test') }}
-    needs: [build_macos, build_windows, build_linux, build_linux-arm, build_linux-arm64]
+    if: ${{ !contains(github.ref, 'test') }}
+    needs: [build_macos, build_windows, build_linux]
     steps:
+    - name: Create Release
+      uses: actions/create-release@v1
+      id: create_release
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          draft: true
+          prerelease: true
     - name: Download Artifacts
-      uses: actions/download-artifact@v4.1.7
+      uses: actions/download-artifact@v2
       with:
         path: .
     - name: Preparation
@@ -178,24 +111,34 @@ jobs:
         ls -R
         chmod u+x macos/Contents/MacOS/yarr
         chmod u+x linux/yarr
-        chmod u+x linux_arm/yarr
-        chmod u+x linux_arm64/yarr
 
-        mv macos yarr.app && zip -r yarr-${GITHUB_REF_NAME}-macos64.zip yarr.app
-        ( cd windows        && zip ../yarr-${GITHUB_REF_NAME}-windows64.zip yarr.exe )
-        ( cd linux          && zip ../yarr-${GITHUB_REF_NAME}-linux64.zip yarr )
-        ( cd linux_arm      && zip ../yarr-${GITHUB_REF_NAME}-linux_arm.zip yarr )
-        ( cd linux_arm64    && zip ../yarr-${GITHUB_REF_NAME}-linux_arm64.zip yarr )
-    - name: Upload Release
-      uses: softprops/action-gh-release@v2
+        mv macos yarr.app     && zip -r yarr-macos.zip yarr.app
+        mv windows/yarr.exe . && zip yarr-windows.zip yarr.exe
+        mv linux/yarr .       && zip yarr-linux.zip yarr
+    - name: Upload MacOS
+      uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-          draft: true
-          prerelease: true
-          files: |
-            yarr-${{ github.ref_name }}-macos64.zip
-            yarr-${{ github.ref_name }}-windows64.zip
-            yarr-${{ github.ref_name }}-linux64.zip
-            yarr-${{ github.ref_name }}-linux_arm.zip
-            yarr-${{ github.ref_name }}-linux_arm64.zip
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./yarr-macos.zip
+          asset_name: yarr-${{ github.ref }}-macos64.zip
+          asset_content_type: application/zip
+    - name: Upload Windows
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./yarr-windows.zip
+          asset_name: yarr-${{ github.ref }}-windows64.zip
+          asset_content_type: application/zip
+    - name: Upload Linux
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./yarr-linux.zip
+          asset_name: yarr-${{ github.ref }}-linux64.zip
+          asset_content_type: application/zip

.github/workflows/test.yml

@@ -1,19 +0,0 @@
-name: Test
-
-on: push
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v3
-
-    - name: Set up Go
-      uses: actions/setup-go@v4
-      with:
-        go-version: '^1.18'
-
-    - name: Run tests
-      run: make test

.gitignore

@@ -1,7 +1,5 @@
 /_output
 /yarr
 *.db
-*.db-shm
-*.db-wal
 *.syso
 versioninfo.rc

build.md

@@ -18,7 +18,7 @@ Then run one of the corresponding commands:
     make serve          # starts a server at http://localhost:7070
 
     # ... or build a docker image
-    docker build -t yarr -f etc/dockerfile .
+    docker build -t yarr .
 
 ## ARM compilation
 
@@ -26,7 +26,7 @@ The instructions below are to cross-compile *yarr* to `Linux/ARM*`.
 
 Build:
 
-    docker build -t yarr.arm -f etc/dockerfile.arm .
+    docker build -t yarr.arm -f dockerfile.arm .
 
 Test:
 

doc/changelog.txt

@@ -1,22 +1,9 @@
 # upcoming 
 
 - (new) Fever API support (thanks to @icefed)
-- (new) editable feed link (thanks to @adaszko)
-- (new) switch to feed by clicking the title in the article page (thanks to @tarasglek for suggestion)
-- (new) support multiple media links
 - (fix) duplicate articles caused by the same feed addition (thanks to @adaszko)
 - (fix) relative article links (thanks to @adazsko for the report)
 - (fix) atom article links stored in id element (thanks to @adazsko for the report)
-- (fix) parsing atom feed titles (thanks to @wnh)
-- (fix) sorting same-day batch articles (thanks to @lamescholar for the report)
-- (fix) showing login page in the selected theme (thanks to @feddiriko for the report)
-- (fix) parsing atom feeds with html elements (thanks to @tillcash & @toBeOfUse for the report, @krkk for the fix)
-- (fix) parsing feeds with missing guids (thanks to @hoyii for the report)
-- (fix) sending actual client version to servers (thanks to @aidanholm)
-- (fix) error caused by missing config dir (thanks to @timster)
-- (etc) load external images with no-referrer policy (thanks to @tillcash for the report)
-- (etc) open external links with no-referrer policy (thanks to @donovanglover)
-- (etc) show article content in the list if title is missing (thanks to @asimpson for suggestion)
 
 # v2.4 (2023-08-15)
 

doc/samples.yml

@@ -1,68 +0,0 @@
-- site: https://vimeo.com/channels/staffpicks/videos
-  feed: https://vimeo.com/channels/staffpicks/videos/rss
-  tags: [vimeo, image]
-
-- site: https://www.youtube.com/@everyframeapainting/videos
-  feed: https://www.youtube.com/feeds/videos.xml?channel_id=UCjFqcJQXGZ6T6sxyFB-5i6A"
-  tags: [youtube, image]
-
-- site: https://iwdrm.tumblr.com/
-  feed: https://iwdrm.tumblr.com/rss
-  tags: [tumblr, image]
-
-- site: https://falseknees.tumblr.com/
-  feed: https://falseknees.tumblr.com/rss
-  tags: [tumblr, image]
-
-- site: https://accidentallyquadratic.tumblr.com/
-  feed: https://accidentallyquadratic.tumblr.com/rss
-  info: text blog with code sections
-  tags: [tumblr, text, code]
-
-- site: https://www.flickr.com/photos/maratsafin/
-  feed: https://www.flickr.com/services/feeds/photos_public.gne?id=59021497@N07&lang=en-us&format=atom
-  tags: [flickr, image]
-
-- site: https://www.reddit.com/r/comics
-  feed: https://www.reddit.com/r/comics.rss
-  tags: [reddit, image]
-
-- site: https://www.reddit.com/r/AITAH
-  feed: https://www.reddit.com/r/AITAH.rss
-  tags: [reddit, text]
-
-- site: https://idothei.wordpress.com/
-  feed: https://idothei.wordpress.com/feed/
-  tags: [wordpress, text]
-
-- site: https://www.vidarholen.net/contents/blog/
-  feed: https://www.vidarholen.net/contents/blog/?feed=rss2
-  tags: [wordpress, text]
-
-- site: https://blog.posthaven.com/
-  feed: https://blog.posthaven.com/posts.atom
-  tags: [posthaven, text]
-
-- site: https://medium.com/@dailynewsletter
-  feed: https://medium.com/feed/@dailynewsletter
-  tags: [medium, text]
-
-- site: https://thereveal.substack.com/
-  feed: https://thereveal.substack.com/feed
-  tags: [substack, text]
-
-- site: https://tema.livejournal.com/
-  feed: https://tema.livejournal.com/data/rss
-  tags: [livejournal, text]
-
-- site: https://mametter.hatenablog.com/
-  feed: https://mametter.hatenablog.com/feed
-  tags: [hatena, text]
-
-- site: https://juliepowell.blogspot.com/
-  feed: https://juliepowell.blogspot.com/feeds/posts/default
-  tags: [blogger, text]
-
-- site: https://micro.blog/val
-  feed: https://micro.blog/posts/val
-  tags: [json, microblog]

dockerfile

@@ -0,0 +1,12 @@
+FROM golang:alpine AS build
+RUN apk add build-base git
+WORKDIR /src
+COPY . .
+RUN make build_linux
+
+FROM alpine:latest
+RUN apk add --no-cache ca-certificates && \
+    update-ca-certificates
+COPY --from=build /src/_output/linux/yarr /usr/local/bin/yarr
+EXPOSE 7070
+CMD ["/usr/local/bin/yarr", "-addr", "0.0.0.0:7070", "-db", "/data/yarr.db"]

dockerfile.arm

@@ -28,17 +28,17 @@ RUN env \
         CGO_ENABLED=1 \
         GOOS=linux GOARCH=arm64 \
     go build \
-        -tags "sqlite_foreign_keys linux" \
+        -tags "sqlite_foreign_keys release linux" \
         -ldflags="-s -w" \
-        -o /root/out/yarr.arm64 ./cmd/yarr
+        -o /root/out/yarr.arm64 src/main.go
 
 RUN env \
         CC=arm-linux-gnueabihf-gcc \
         CGO_ENABLED=1 \
         GOOS=linux GOARCH=arm GOARM=7 \
     go build \
-        -tags "sqlite_foreign_keys linux" \
+        -tags "sqlite_foreign_keys release linux" \
         -ldflags="-s -w" \
-        -o /root/out/yarr.arm7 ./cmd/yarr
+        -o /root/out/yarr.arm7 src/main.go
 
 CMD ["/bin/bash"]

etc/dockerfile

@@ -1,14 +0,0 @@
-FROM golang:alpine3.18 AS build
-RUN apk add build-base git
-WORKDIR /src
-COPY . .
-RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/root/go/pkg \
-  make build_linux
-
-FROM alpine:latest
-RUN apk add --no-cache ca-certificates && \
-    update-ca-certificates
-COPY --from=build /src/_output/linux/yarr /usr/local/bin/yarr
-EXPOSE 7070
-ENTRYPOINT ["/usr/local/bin/yarr"]
-CMD ["-addr", "0.0.0.0:7070", "-db", "/data/yarr.db"]

etc/install-linux.sh

@@ -1,9 +1,5 @@
 #!/bin/bash
 
-if [[ ! -d "$HOME/.local/share/applications" ]]; then
-  mkdir -p "$HOME/.local/share/applications"
-fi
-
 cat >"$HOME/.local/share/applications/yarr.desktop" <<END
 [Desktop Entry]
 Name=yarr
@@ -13,10 +9,6 @@ Type=Application
 Categories=Internet;
 END
 
-if [[ ! -d "$HOME/.local/share/icons" ]]; then
-  mkdir -p "$HOME/.local/share/icons"
-fi
-
 cat >"$HOME/.local/share/icons/yarr.svg" <<END
 <?xml version="1.0" encoding="UTF-8"?>
 <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">

go.mod

@@ -1,11 +1,11 @@
 module github.com/nkanaev/yarr
 
-go 1.18
+go 1.17
 
 require (
 	github.com/mattn/go-sqlite3 v1.14.7
-	golang.org/x/net v0.33.0
-	golang.org/x/sys v0.28.0
+	golang.org/x/net v0.8.0
+	golang.org/x/sys v0.6.0
 )
 
-require golang.org/x/text v0.21.0 // indirect
+require golang.org/x/text v0.8.0 // indirect

go.sum

@@ -1,70 +1,39 @@
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/mattn/go-sqlite3 v1.14.7 h1:fxWBnXkxfM6sRiuH3bqJ4CfzZojMOLVc0UTsTglEghA=
 github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
-golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
+golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
+golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
-golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
-golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
+golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
+golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

makefile

@@ -1,34 +1,33 @@
 VERSION=2.4
 GITHASH=$(shell git rev-parse --short=8 HEAD)
 
-GO_TAGS    = sqlite_foreign_keys sqlite_json
-GO_LDFLAGS = -s -w -X 'main.Version=$(VERSION)' -X 'main.GitHash=$(GITHASH)'
+CGO_ENABLED=1
 
-export GOARCH      ?= amd64
-export CGO_ENABLED  = 1
+GO_LDFLAGS  = -s -w
+GO_LDFLAGS := $(GO_LDFLAGS) -X 'main.Version=$(VERSION)' -X 'main.GitHash=$(GITHASH)'
 
 build_default:
 	mkdir -p _output
-	go build -tags "$(GO_TAGS)" -ldflags="$(GO_LDFLAGS)" -o _output/yarr ./cmd/yarr
+	go build -tags "sqlite_foreign_keys release" -ldflags="$(GO_LDFLAGS)" -o _output/yarr src/main.go
 
 build_macos:
 	mkdir -p _output/macos
-	GOOS=darwin go build -tags "$(GO_TAGS) macos" -ldflags="$(GO_LDFLAGS)" -o _output/macos/yarr ./cmd/yarr
+	GOOS=darwin GOARCH=amd64 go build -tags "sqlite_foreign_keys release macos" -ldflags="$(GO_LDFLAGS)" -o _output/macos/yarr src/main.go
 	cp src/platform/icon.png _output/macos/icon.png
-	go run ./cmd/package_macos -outdir _output/macos -version "$(VERSION)"
+	go run bin/package_macos.go -outdir _output/macos -version "$(VERSION)"
 
 build_linux:
 	mkdir -p _output/linux
-	GOOS=linux go build -tags "$(GO_TAGS) linux" -ldflags="$(GO_LDFLAGS)" -o _output/linux/yarr ./cmd/yarr
+	GOOS=linux GOARCH=amd64 go build -tags "sqlite_foreign_keys release linux" -ldflags="$(GO_LDFLAGS)" -o _output/linux/yarr src/main.go
 
 build_windows:
 	mkdir -p _output/windows
-	go run ./cmd/generate_versioninfo -version "$(VERSION)" -outfile src/platform/versioninfo.rc
+	go run bin/generate_versioninfo.go -version "$(VERSION)" -outfile src/platform/versioninfo.rc
 	windres -i src/platform/versioninfo.rc -O coff -o src/platform/versioninfo.syso
-	GOOS=windows go build -tags "$(GO_TAGS) windows" -ldflags="$(GO_LDFLAGS) -H windowsgui" -o _output/windows/yarr.exe ./cmd/yarr
+	GOOS=windows GOARCH=amd64 go build -tags "sqlite_foreign_keys release windows" -ldflags="$(GO_LDFLAGS) -H windowsgui" -o _output/windows/yarr.exe src/main.go
 
 serve:
-	go run -tags "$(GO_TAGS)" ./cmd/yarr -db local.db
+	go run -tags "sqlite_foreign_keys" src/main.go -db local.db
 
 test:
-	go test -tags "$(GO_TAGS)" ./...
+	cd src && go test -tags "sqlite_foreign_keys release" ./...

readme.md

@@ -10,29 +10,27 @@ The app is a single binary with an embedded database (SQLite).
 ## usage
 
 The latest prebuilt binaries for Linux/MacOS/Windows AMD64 are available
-[here](https://github.com/nkanaev/yarr/releases/latest). Installation instructions:
+[here](https://github.com/nkanaev/yarr/releases/latest).
 
-* MacOS
+### macos
 
 Download `yarr-*-macos64.zip`, unzip it, place `yarr.app` in `/Applications` folder, [open the app][macos-open], click the anchor menu bar icon, select "Open".
 
-* Windows
+[macos-open]: https://support.apple.com/en-gb/guide/mac-help/mh40616/mac
+
+### windows
 
 Download `yarr-*-windows64.zip`, unzip it, open `yarr.exe`, click the anchor system tray icon, select "Open".
 
-* Linux
+### linux
 
 Download `yarr-*-linux64.zip`, unzip it, place `yarr` in `$HOME/.local/bin`
 and run [the script](etc/install-linux.sh).
 
-[macos-open]: https://support.apple.com/en-gb/guide/mac-help/mh40616/mac
-
 For self-hosting, see `yarr -h` for auth, tls & server configuration flags.
+For building from source code, see [build.md](build.md)
 
-See more:
-
-* [Building from source code](doc/build.md)
-* [Fever API support](doc/fever.md)
+For Fever API support, see [fever.md](fever.md).
 
 ## credits
 

src/assets/assetsfs.go

@@ -1,3 +1,6 @@
+//go:build release
+// +build release
+
 package assets
 
 import "embed"
@@ -6,6 +9,7 @@ import "embed"
 //go:embed graphicarts
 //go:embed javascripts
 //go:embed stylesheets
+//go:embed manifest.json
 var embedded embed.FS
 
 func init() {