Merge pull request #22 from rtmelsov/develop

Develop

Author: rtmelsov

.gitignore

@@ -22,3 +22,4 @@ db/migrations/*.sql-journal
 .DS_Store
 /var/
 opt/
+demo.mp4

internal/helpers/config.go

@@ -9,7 +9,7 @@ import (
 
 var (
 	Addr             = "89.207.255.214:8080"
-	DownloadFilesDir = "./"
+	DownloadFilesDir = "."
 )
 
 type Config struct {

internal/tui/app.go

@@ -18,6 +18,8 @@ type ProfileModel struct {
 }
 
 type TuiModel struct {
+	StreamLoading bool
+
 	uploadCh    <-chan models.Prog
 	Uploaded    int64
 	UploadTotal int64

internal/tui/file_screen.go

@@ -62,6 +62,7 @@ func (m TuiModel) FileDetailsAction(msg string) (tea.Model, tea.Cmd) {
 		}
 		if m.RightCursor == 1 {
 			m.Loading = true
+			m.StreamLoading = true
 			return m, tea.Batch(
 				m.Spin.Tick,
 				func() tea.Msg {

internal/tui/screen.go

@@ -93,6 +93,7 @@ func (m TuiModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			}
 		case finishedMsg:
 			m.Loading = false
+			m.StreamLoading = false
 			switch msg.Kind {
 			case OpUpload:
 				m.Uploading = false

internal/tui/vault_screen.go

@@ -67,22 +67,6 @@ func listenNext(kind OpKind, id string, ch <-chan models.Prog) tea.Cmd {
 	}
 }
 
-func startUploadCmd(id, path string) tea.Cmd {
-	return func() tea.Msg {
-		ch := make(chan models.Prog, 32)
-		go akclient.UploadFile(path, ch)
-		return progressChanReadyMsg{Kind: OpUpload, ID: id, ch: ch}
-	}
-}
-
-func startDownloadCmd(id, fileID, outPath string) tea.Cmd {
-	return func() tea.Msg {
-		ch := make(chan models.Prog, 32)
-		go akclient.DownloadFile(fileID, ch)
-		return progressChanReadyMsg{Kind: OpDownload, ID: id, ch: ch}
-	}
-}
-
 func (m TuiModel) VaultAction(msg string) (tea.Model, tea.Cmd) {
 	switch msg {
 	case "esc":
@@ -108,6 +92,7 @@ func (m TuiModel) VaultAction(msg string) (tea.Model, tea.Cmd) {
 			return m, m.FilePicker.Init() // ← важный момент
 		} else if m.SelectedFile != "" {
 			m.Loading = true
+			m.StreamLoading = true
 			return m, tea.Batch(
 				m.Spin.Tick,
 				func() tea.Msg {

internal/tui/view.go

@@ -23,7 +23,7 @@ func (m TuiModel) View() string {
 	// --- Header/status (outside the box) ---
 	status := ""
 	if m.Loading {
-		if m.Uploading || m.Downloading {
+		if m.StreamLoading {
 			return m.loadingView()
 		} else {
 			status = ui.StatusBar.Render(m.Spin.View()+" Загрузка…") +