Skip to content

Branch 1.2.26 #512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Fyb3roptik merged 6 commits into from
Jan 13, 2025
Merged

Branch 1.2.26 #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
171cbd2
Handle tall logos to keep rows a uniform height
joshjryan Jan 12, 2025
6edd9f5
Attempt to fix the 'interface {} is nil' issue
joshjryan Jan 12, 2025
160b608
Merge pull request #509 from joshjryan/main
Fyb3roptik Jan 13, 2025
2d55c1d
Merge pull request #508 from joshjryan/style-tweaks
Fyb3roptik Jan 13, 2025
3f12943
Pushing up repack
Fyb3roptik Jan 13, 2025
a2be357
doh
Fyb3roptik Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion html/css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ label {
li {
list-style-type: none;
cursor: pointer;
transition: all 0.3;
transition: all 0.3s;
}

li:hover {
Expand Down
45 changes: 42 additions & 3 deletions html/css/screen.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,44 @@ tbody {
max-width: 60px;
}

#content_table .logo-cell .imgWrap,
#inactive_content_table .logo-cell .imgWrap {
width: 60px;
height: 50px;
overflow: hidden;
display: flex;
justify-content: center;
align-items: center;
position: relative;
padding: 0;
box-sizing: border-box;
vertical-align: middle;
}

#content_table .logo-cell img,
#inactive_content_table .logo-cell img {
width: 60px;
height: auto;
transition: all 0.3s ease;
}

#content_table .logo-cell .imgWrap:hover,
#inactive_content_table .logo-cell .imgWrap:hover {
min-height: 50px;
height: auto;
overflow: visible;
}

#content_table .logo-cell .imgWrap:hover img,
#inactive_content_table .logo-cell .imgWrap:hover img {
height: auto;
max-height: none;
width: 60px;
}

#content_table tr,
#inactive_content_table tr {
border-left: solid 3px 444;
border-left: solid 3px #444;
border-bottom: solid 1px #333;
cursor: pointer;
}
Expand All @@ -325,8 +360,8 @@ tbody {
#content_table input[type=text],
#inactive_content_table input[type=text] {
width: 80%;
min-width: 35px;
max-width: 60px;
min-width: 60px;
max-width: 75px;
border: 0px;
background-color: #333;
margin-left: 5px;
Expand Down Expand Up @@ -763,8 +798,12 @@ Sidebar
cursor: pointer;
border-radius: 5px;
z-index: 1000;
border: 1px solid #222;
box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19);
transition: all .3s ease;
}

#back-to-top:hover {
background-color: #555;
box-shadow: 0 8px 16px 0 rgba(0,0,0,0.4), 0 6px 20px 0 rgba(0,0,0,0.39)
}
18 changes: 12 additions & 6 deletions html/js/menu_ts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@ class Content {
cell.imageURL = data[key]["tvg-logo"];
var td = cell.createCell();
td.setAttribute('onclick', 'javascript: openPopUp("mapping", this)');
td.className = "logo-cell";
td.id = key;
tr.appendChild(td);
// Kanalname
Expand Down Expand Up @@ -481,6 +482,7 @@ class Content {
cell.imageURL = data[key]["tvg-logo"];
var td = cell.createCell();
td.setAttribute('onclick', 'javascript: openPopUp("mapping", this)');
td.className = "logo-cell";
td.id = key;
tr.appendChild(td);
// Kanalname
Expand Down Expand Up @@ -607,12 +609,16 @@ class Cell {
}
break;
case "IMG":
element = document.createElement(this.childType);
element.setAttribute("src", this.imageURL);
var imgElement;
imgElement = document.createElement(this.childType);
imgElement.setAttribute("src", this.imageURL);
if (this.imageURL != "") {
element.setAttribute("onerror", "javascript: this.onerror=null;this.src=''");
imgElement.setAttribute("onerror", "javascript: this.onerror=null;this.src=''");
//onerror="this.onerror=null;this.src='missing.gif';"
}
element = document.createElement("DIV");
element.className = "imgWrap";
element.appendChild(imgElement);
}
td.appendChild(element);
}
Expand Down Expand Up @@ -753,7 +759,7 @@ class ShowContent extends Content {
console.log("Show content (menuKey):", menuKey);
break;
}
// Tabelle erstellen (falls benötigt)
// Create table (if needed)
var tableHeader = menuItems[this.menuID].tableHeader;
if (tableHeader.length > 0) {
var wrapper = document.createElement("DIV");
Expand All @@ -763,7 +769,7 @@ class ShowContent extends Content {
wrapper.appendChild(table);
var header = this.createTableRow();
table.appendChild(header);
// Kopfzeile der Tablle
// Table header
tableHeader.forEach(element => {
var cell = new Cell();
cell.child = true;
Expand Down Expand Up @@ -2228,7 +2234,7 @@ function donePopupData(dataType, idsStr) {
document.getElementById(id).className = "activeEPG";
}
console.log(input["tvg-logo"]);
document.getElementById(id).childNodes[2].firstChild.setAttribute("src", input["tvg-logo"]);
document.getElementById(id).childNodes[2].firstChild.firstChild.setAttribute("src", input["tvg-logo"]);
});
showElement("popup", false);
return;
Expand Down
6 changes: 5 additions & 1 deletion src/buffer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,11 @@ func bufferingStream(playlistID string, streamingURL string, backupStream1 *Back
playListInterface = Settings.Files.HDHR[playlistID]
}
if playListMap, ok := playListInterface.(map[string]interface{}); ok {
playListBuffer = playListMap["buffer"].(string)
if buffer, ok := playListMap["buffer"].(string); ok {
playListBuffer = buffer
} else {
playListBuffer = "-"
}
}
systemMutex.Unlock()

Expand Down
68 changes: 34 additions & 34 deletions src/webUI.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions threadfin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ var GitHub = GitHubStruct{Branch: "Main", User: "Threadfin", Repo: "Threadfin",
const Name = "Threadfin"

// Version : Version, die Build Nummer wird in der main func geparst.
const Version = "1.2.25"
const Version = "1.2.26"

// DBVersion : Datanbank Version
const DBVersion = "0.5.0"

// APIVersion : API Version
const APIVersion = "1.2.25"
const APIVersion = "1.2.26"

var homeDirectory = fmt.Sprintf("%s%s.%s%s", src.GetUserHomeDirectory(), string(os.PathSeparator), strings.ToLower(Name), string(os.PathSeparator))
var samplePath = fmt.Sprintf("%spath%sto%sthreadfin%s", string(os.PathSeparator), string(os.PathSeparator), string(os.PathSeparator), string(os.PathSeparator))
Expand Down
19 changes: 13 additions & 6 deletions ts/menu_ts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,7 @@ class Content {
cell.imageURL = data[key]["tvg-logo"]
var td = cell.createCell()
td.setAttribute('onclick', 'javascript: openPopUp("mapping", this)')
td.className = "logo-cell"
td.id = key

tr.appendChild(td)
Expand Down Expand Up @@ -591,6 +592,7 @@ class Content {
cell.imageURL = data[key]["tvg-logo"]
var td = cell.createCell()
td.setAttribute('onclick', 'javascript: openPopUp("mapping", this)')
td.className = "logo-cell"
td.id = key

tr.appendChild(td)
Expand Down Expand Up @@ -756,12 +758,17 @@ class Cell {
break

case "IMG":
element = document.createElement(this.childType);
element.setAttribute("src", this.imageURL)
var imgElement: any
imgElement = document.createElement(this.childType);
imgElement.setAttribute("src", this.imageURL)
if (this.imageURL != "") {
element.setAttribute("onerror", "javascript: this.onerror=null;this.src=''")
imgElement.setAttribute("onerror", "javascript: this.onerror=null;this.src=''")
//onerror="this.onerror=null;this.src='missing.gif';"
}
element = document.createElement("DIV");
element.className = "imgWrap";
element.appendChild(imgElement);

}

td.appendChild(element)
Expand Down Expand Up @@ -939,7 +946,7 @@ class ShowContent extends Content {
break;
}

// Tabelle erstellen (falls benötigt)
// Create table (if needed)
var tableHeader: string[] = menuItems[this.menuID].tableHeader
if (tableHeader.length > 0) {
var wrapper = document.createElement("DIV")
Expand All @@ -952,7 +959,7 @@ class ShowContent extends Content {
var header = this.createTableRow()
table.appendChild(header)

// Kopfzeile der Tablle
// Table header
tableHeader.forEach(element => {
var cell: Cell = new Cell()
cell.child = true
Expand Down Expand Up @@ -2794,7 +2801,7 @@ function donePopupData(dataType: string, idsStr: string) {
}

console.log(input["tvg-logo"]);
(document.getElementById(id).childNodes[2].firstChild as HTMLElement).setAttribute("src", input["tvg-logo"])
(document.getElementById(id).childNodes[2].firstChild.firstChild as HTMLElement).setAttribute("src", input["tvg-logo"])


});
Expand Down