Skip to content

Commit dcbd457

Browse files
Squashed commit of the following:
commit 60dc829 Author: Marcel Goerentz <[email protected]> Date: Tue Jul 9 07:25:22 2024 +0200 Make release commit c048824 Author: Marcel Goerentz <[email protected]> Date: Mon Jul 8 15:13:10 2024 +0200 Add banner in webinterface to inform user about a newer version commit c40695c Author: Marcel Goerentz <[email protected]> Date: Mon Jul 8 10:32:32 2024 +0200 Update threadfin.go commit 022d2ce Author: Marcel Goerentz <[email protected]> Date: Mon Jul 8 10:23:33 2024 +0200 Update updater commit 29cdd93 Author: Marcel Goerentz <[email protected]> Date: Mon Jul 8 07:36:20 2024 +0200 Rework imgcache module commit 21f1eee Merge: 1fe2789 307d171 Author: Marcel Goerentz <[email protected]> Date: Mon Jul 8 07:30:01 2024 +0200 Merge branch 'beta' of github.com:marcelGoerentz/Threadfin into beta commit 1fe2789 Author: Marcel Goerentz <[email protected]> Date: Mon Jul 8 07:29:29 2024 +0200 Fix update bug commit 307d171 Merge: 12151ec 31bc0b5 Author: Marcel Goerentz <[email protected]> Date: Fri Jul 5 23:15:33 2024 +0200 Merge pull request marcelGoerentz#5 from marcelGoerentz/feature/clean_codebase Clean codebase commit 31bc0b5 Author: Marcel Goerentz <[email protected]> Date: Fri Jul 5 23:13:38 2024 +0200 Clean codebase commit 48909e0 Author: Marcel Goerentz <[email protected]> Date: Fri Jul 5 22:13:26 2024 +0200 Second step when reworking the cache commit df03e9e Author: Marcel Goerentz <[email protected]> Date: Fri Jul 5 12:30:49 2024 +0200 This is the first step to rework the image cache commit e73ebcf Author: Marcel Goerentz <[email protected]> Date: Tue Jul 2 15:27:46 2024 +0200 Update image caching commit 6b79e6c Author: Marcel Goerentz <[email protected]> Date: Tue Jul 2 13:18:22 2024 +0200 Clean codebase commit 2a77252 Author: Marcel Goerentz <[email protected]> Date: Fri Jun 28 22:26:37 2024 +0200 Update info command commit 1fd8f95 Author: Marcel Goerentz <[email protected]> Date: Fri Jun 28 08:07:00 2024 +0200 Update README.md commit dcb89d9 Author: Marcel Goerentz <[email protected]> Date: Thu Jun 27 23:52:37 2024 +0200 Delete .vscode commit 35be82f Author: Marcel Goerentz <[email protected]> Date: Thu Jun 27 23:50:45 2024 +0200 Clean codebase commit 889d3bf Merge: d3082bd a24ba2d Author: Marcel Goerentz <[email protected]> Date: Thu Jun 27 15:22:25 2024 +0200 Merge branch 'main' into feature/clean_codebase commit d3082bd Author: Marcel Goerentz <[email protected]> Date: Thu Jun 27 15:21:51 2024 +0200 Clean codebase and give more options for the network interface, add https server commit 8138352 Author: Marcel Goerentz <[email protected]> Date: Tue Jun 25 09:55:22 2024 +0200 Clean codebase and add feature to disable ports in stream urls
1 parent a24ba2d commit dcbd457

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+812
-4411
lines changed

.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
threadfin
33
vendor/
44
.DS_Store
5-
threadfin.exe
65
binaries/
76
*.js.map
87
.vscode/
98
dist/
9+
node_modules/
10+
*.exe
11+
*.js

.vscode/launch.json

-14
This file was deleted.

.vscode/tasks.json

-26
This file was deleted.

README.md

+25-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div align="center" style="background-color: #111; padding: 100;">
2-
<a href="https://github.com/Threadfin/Threadfin"><img width="285" height="80" src="html/img/threadfin.png" alt="Threadfin" /></a>
2+
<a href="https://github.com/marcelGoerentz/Threadfin"><img width="285" height="80" src="html/img/threadfin.png" alt="Threadfin" /></a>
33
</div>
44
<br>
55

@@ -9,7 +9,7 @@
99
You can follow the old xTeVe documentation for now until I update it for Threadfin. Documentation for setup and configuration is [here](https://github.com/xteve-project/xTeVe-Documentation/blob/master/en/configuration.md).
1010

1111
#### Donation
12-
[Github Sponsor](https://github.com/sponsors/Fyb3roptik)
12+
[Paypal/Me](https://paypal.me/MarcelGoerentz)
1313

1414
## Requirements
1515
### Plex
@@ -32,6 +32,7 @@ You can follow the old xTeVe documentation for now until I update it for Threadf
3232

3333
* New Bootstrap based UI
3434
* RAM based buffer instead of File based
35+
* HTTPS Webserver
3536

3637
#### Filter Group
3738
* Can now add a starting channel number for the filter group
@@ -68,8 +69,26 @@ You can follow the old xTeVe documentation for now until I update it for Threadf
6869

6970
---
7071

72+
## CLI arguments
73+
74+
These are the currently available command line arguments:
75+
76+
| arg | type | description | example |
77+
|:-----------|:--------|:--------------------------------------------------------|:--------------------------------------------|
78+
| -h | bool | prints the help and don't start the service | -h |
79+
| -dev | bool | activates the developer mode | -dev |
80+
| -config | string | sets the path to the root config folder | -config=~./.threadfin |
81+
| -port | integer | sets the port for the webserver (also for https) | -port=34400 |
82+
| -useHttps | bool | switches the webserver to https | -useHttps |
83+
| -restore | string | restores the settings from the given filepath | -restore=/path/to/file/threadfin_backup.zip |
84+
| -gitBranch | string | sets the branch from which the program is to be updated | -gitBranch=beta |
85+
| -debug | integer | sets the debug level | -debug=3 |
86+
| -info | bool | prints the system info | -info |
87+
88+
---
89+
7190
## Docker Image
72-
[Threadfin](https://hub.docker.com/r/fyb3roptik/threadfin)
91+
[Threadfin](https://hub.docker.com/r/marcelGoerentz/threadfin)
7392

7493
* Docker compose example
7594

@@ -94,15 +113,15 @@ services:
94113
---
95114

96115
### Threadfin Beta branch
97-
New features and bug fixes are only available in beta branch. Only after successful testing are they are merged into the main branch.
116+
New features and bug fixes are only available in beta branch. Only after successful testing they are merged into the main branch.
98117

99118
**It is not recommended to use the beta version in a production system.**
100119

101120
With the command line argument `branch` the Git Branch can be changed. Threadfin must be started via the terminal.
102121

103122
#### Switch from master to beta branch:
104123
```
105-
threadfin -branch beta
124+
threadfin -branch=beta
106125
107126
...
108127
[Threadfin] GitHub: https://github.com/Threadfin/Threadfin
@@ -112,7 +131,7 @@ threadfin -branch beta
112131

113132
#### Switch from beta to master branch:
114133
```
115-
threadfin -branch main
134+
threadfin -branch=main
116135
117136
...
118137
[Threadfin] GitHub: https://github.com/Threadfin/Threadfin

html/css/base.css

+14
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,20 @@ table {
448448

449449
}
450450

451+
.banner {
452+
position: fixed;
453+
top: 0;
454+
left: 0;
455+
width: 100%;
456+
background-color: #000000;
457+
color: #ffffff;
458+
padding: 10px;
459+
text-align: center;
460+
font-size: 16px;
461+
display: none;
462+
z-index: 99999;
463+
}
464+
451465
@-webkit-keyframes spin {
452466
0% {
453467
-webkit-transform: rotate(0deg);

html/index.html

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!doctype html>
2-
<html>
2+
<html lang="en">
33

44
<head>
55
<meta charset="utf-8">
@@ -21,6 +21,10 @@
2121

2222
<body onload="javascript: PageReady();">
2323

24+
<div class="banner">
25+
Neue Version verfügbar! Klicken Sie <a href="https://github.com/marcelGoerentz/Threadfin/releases/latest">hier</a>, um sie herunterzuladen.
26+
</div>
27+
2428
<div id="loading" class="modal fade">
2529
<div class="modal-dialog loader"></div>
2630
</div>
@@ -32,7 +36,8 @@
3236
<div class="modal-body">
3337
<div class="container-fluid">
3438
<div class="row">
35-
<div id="popup-custom"></div>
39+
<div id="popup-custom">
40+
</div>
3641
</div>
3742
</div>
3843
</div>
@@ -131,6 +136,6 @@ <h3 class="modal-title">Server Information</h3>
131136
<script language="javascript" type="text/javascript" src="js/settings_ts.js"></script>
132137
<script language="javascript" type="text/javascript" src="js/logs_ts.js"></script>
133138
<script language="javascript" type="text/javascript" src="js/base_ts.js"></script>
139+
<script language="javascript" type="text/javascript" src="js/banner.js"></script>
134140
</body>
135-
136141
</html>

html/js/authentication_ts.js

-33
This file was deleted.

0 commit comments

Comments
 (0)