Merge branch 'UniversalMediaServer:master' into master

.deepsource.toml

@@ -0,0 +1,17 @@
+version = 1
+
+exclude_patterns = ["src/main/external-resources/web/util/**"]
+
+[[analyzers]]
+name = "java"
+enabled = true
+
+  [analyzers.meta]
+  runtime_version = "8"
+
+[[analyzers]]
+name = "javascript"
+enabled = true
+
+  [analyzers.meta]
+  plugins = ["angularjs"]

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: universalmediaserver
+open_collective: universalmediaserver
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: ['https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=KZLD5J8DS6K6W']

.github/dependabot.yml

@@ -0,0 +1,21 @@
+version: 2
+updates:
+- package-ecosystem: maven
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: com.github.oshi:oshi-core
+    versions:
+    - 5.5.0
+    - 5.5.1
+    - 5.6.0
+    - 5.6.1
+    - 5.7.0
+  - dependency-name: net.java.dev.jna:jna-platform
+    versions:
+    - 5.7.0
+  - dependency-name: net.java.dev.jna:jna
+    versions:
+    - 5.7.0

.github/workflows/ci.yaml

@@ -0,0 +1,123 @@
+name: Universal Media Server CI
+
+on: [push, pull_request]
+
+jobs:
+  macos:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        # test against two different xcode version on MacOS
+        xcode: [ 9.4.1, latest ]
+        java-version: [ 8 ]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK ${{ matrix.java-version }}
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'liberica'
+          java-version: ${{ matrix.java-version }}
+      - name: Set up Maven
+        uses: stCarolas/setup-maven@v4
+        with:
+          maven-version: 3.6.3
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Run tests (XCode ${{ matrix.xcode }})
+        run: DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer && mvn verify -P testing-macos
+
+  windows-latest:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        java-version: [ 8 ]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK ${{ matrix.java-version }}
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'liberica'
+          java-version: ${{ matrix.java-version }}
+      - name: Set up Maven
+        uses: stCarolas/setup-maven@v4
+        with:
+          maven-version: 3.6.3
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Run linter and tests
+        run: mvn verify -P linter
+
+  linux-bionic:
+    runs-on: ubuntu-18.04
+    strategy:
+      matrix:
+        java-version: [ 8 ]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK ${{ matrix.java-version }}
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'liberica'
+          java-version: ${{ matrix.java-version }}
+      - name: Set up Maven
+        uses: stCarolas/setup-maven@v4
+        with:
+          maven-version: 3.6.3
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Run tests
+        run: |
+          sudo apt-get -y install libmms0
+          wget https://mediaarea.net/download/binary/libzen0/0.4.39/libzen0v5_0.4.39-1_amd64.xUbuntu_18.04.deb
+          sudo dpkg -i libzen0v5_0.4.39-1_amd64.xUbuntu_18.04.deb
+          wget https://mediaarea.net/download/binary/libmediainfo0/21.03/libmediainfo0v5_21.03-1_amd64.xUbuntu_18.04.deb
+          sudo dpkg -i libmediainfo0v5_21.03-1_amd64.xUbuntu_18.04.deb
+          mvn verify -P testing
+
+  linux-focal:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        java-version: [ 8 ]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK ${{ matrix.java-version }}
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'liberica'
+          java-version: ${{ matrix.java-version }}
+      - name: Set up Maven
+        uses: stCarolas/setup-maven@v4
+        with:
+          maven-version: 3.6.3
+      - name: Cache Maven packages
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+      - name: Run tests
+        run: |
+          sudo apt-get -y install libmms0
+          wget https://mediaarea.net/download/binary/libzen0/0.4.39/libzen0v5_0.4.39-1_amd64.xUbuntu_20.04.deb
+          sudo dpkg -i libzen0v5_0.4.39-1_amd64.xUbuntu_20.04.deb
+          wget https://mediaarea.net/download/binary/libmediainfo0/21.03/libmediainfo0v5_21.03-1_amd64.xUbuntu_20.04.deb
+          sudo dpkg -i libmediainfo0v5_21.03-1_amd64.xUbuntu_20.04.deb
+          mvn verify -P testing

.gitignore

@@ -1,6 +1,6 @@
 .classpath
 contrib/ffmpeg/build
-database
+/database
 debug.log
 .DS_Store
 .idea/
@@ -11,6 +11,26 @@ MediaInfo-License.html
 pms.iml
 .project
 .settings
-target
 *.orig
-
+*.sublime-*
+Thumbs.db
+extras/
+target/
+/web/
+win32/
+.vscode/settings.json
+/src/main/pascal/ctrlsender/lib/
+/src/main/pascal/ctrlsender/backup/
+/src/main/pascal/ctrlsender/*.exe
+*.eclipse-pmd
+/src/main/java/net/pms/Test.java
+.recommenders/
+.metadata/
+docker/renderers
+docker/web
+docker/ums.jar
+docker/logback.headless.xml
+docker/linux*
+docker/jre*
+/src/main/java/net/pms/Test.java
+.yarn-integrity

.vscode/launch.json

@@ -0,0 +1,23 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "java",
+            "name": "Launch Current File",
+            "request": "launch",
+            "mainClass": "${file}"
+        },
+        {
+            "type": "java",
+            "name": "Launch UMS",
+            // Copy website files to web folder at root
+            "preLaunchTask": "copy website",
+            "request": "launch",
+            "mainClass": "net.pms.PMS",
+            "projectName": "ums"
+        }
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,25 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"label": "copy website",
+			"type": "shell",
+			"windows": {
+				// Default terminal profile must be Powershell
+				"command": "Copy-Item -Path ${workspaceFolder}/src/main/external-resources/web -Destination ${workspaceFolder} -Recurse -Force"
+			},
+			"linux": {
+				"command": "cp -a ${workspaceFolder}/src/main/external-resources/web/. ${workspaceFolder}/web"
+			},
+			"presentation": {
+				"echo": true,
+				"reveal": "never",
+				"focus": false,
+				"panel": "shared",
+				"showReuseMessage": true,
+				"clear": false
+			},
+			"group": "build"
+		}
+	]
+}

BUILD.md

@@ -0,0 +1,2 @@
+These instructions have moved to our Wiki to make collaboration easier.
+Please see https://github.com/UniversalMediaServer/UniversalMediaServer/wiki/How-to-build-UMS