Merge pull request #6 from husudosu/dev

husudosu · web-flow · commit a618f0ac4535 · 2022-02-23T08:20:30.000+01:00
Dev
diff --git a/.gitignore b/.gitignore
@@ -29,4 +29,5 @@ npm-debug.log*
 /platforms
 /plugins
 /www
-resources/android
+resources/android
+package-lock.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,3 +15,17 @@ Very important to update mpv-remote-node to 1.0.5!
 - Support for multiple servers,
 - Multiple server handling
 - Filebrowser speed improvements with larger directories/collections
+
+## 1.0.6
+
+Minimum [mpv-remote-node](https://github.com/husudosu/mpv-remote-node) version: 1.0.5
+Before installing this version of MPV-remote app, please uninstall the previous one! Some Android related stuff changed!
+
+- File browser speed improvements with large collections,
+- Improved server selector,
+- Better validation on create server screen
+
+Important Android stuff:
+
+- Changed app id from "io.ionic.starter" to "com.husudosu.mpvremote"
+- From now on VersionCode will be increased after every release.
diff --git a/TODO.md b/TODO.md
@@ -20,5 +20,4 @@ ionic capacitor run android -l --host=host
 
 ## TODO
 
-- By some reasons routing not working properly, when not using modals on Settings -> Servers and Media collections,
-- Filebrowser need more optimization
+- By some reasons routing not working properly, when not using modals on Settings -> Servers and Media collections
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -3,11 +3,11 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     defaultConfig {
-        applicationId "io.ionic.starter"
+        applicationId "com.husudosu.mpvremote"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0.5"
+        versionCode 6
+        versionName "1.0.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
diff --git a/android/app/release/output-metadata.json b/android/app/release/output-metadata.json
@@ -4,14 +4,14 @@
     "type": "APK",
     "kind": "Directory"
   },
-  "applicationId": "io.ionic.starter",
+  "applicationId": "com.husudosu.mpvremote",
   "variantName": "release",
   "elements": [
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 1,
-      "versionName": "1.0.5",
+      "versionCode": 6,
+      "versionName": "1.0.6",
       "outputFile": "app-release.apk"
     }
   ]
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest package="io.ionic.starter" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest package="com.husudosu.mpvremote" xmlns:android="http://schemas.android.com/apk/res/android">
     <application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true">
-        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode" android:label="@string/title_activity_main" android:launchMode="singleTask" android:name="io.ionic.starter.MainActivity" android:theme="@style/AppTheme.NoActionBarLaunch">
+        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode" android:label="@string/title_activity_main" android:launchMode="singleTask" android:name="com.husudosu.mpvremote.MainActivity" android:theme="@style/AppTheme.NoActionBarLaunch">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -15,13 +15,10 @@
                 <action android:name="com.darryncampbell.cordova.plugin.intent.ACTION" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <!-- This filter captures protocols without type info -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-
                 <data android:scheme="rtmp" />
                 <data android:scheme="rtmpe" />
                 <data android:scheme="rtmps" />
@@ -34,13 +31,10 @@
                 <data android:scheme="udp" />
                 <data android:scheme="vlc" />
             </intent-filter>
-            <!-- This filter captures protocols with type info -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-
                 <data android:mimeType="video/*" />
                 <data android:mimeType="audio/*" />
                 <data android:scheme="rtmp" />
@@ -56,10 +50,8 @@
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-
                 <data android:scheme="" />
                 <data android:scheme="file" />
                 <data android:scheme="ftp" />
@@ -94,20 +86,15 @@
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-
                 <data android:scheme="" />
                 <data android:scheme="file" />
                 <data android:scheme="ftp" />
                 <data android:scheme="content" />
                 <data android:scheme="http" />
                 <data android:scheme="https" />
                 <data android:host="*" />
-
-                <!-- video -->
-
                 <data android:pathPattern=".*\\.3g2" />
                 <data android:pathPattern=".*\\.3gp" />
                 <data android:pathPattern=".*\\.3gp2" />
@@ -128,7 +115,6 @@
                 <data android:pathPattern=".*\\.m2v" />
                 <data android:pathPattern=".*\\.m2t" />
                 <data android:pathPattern=".*\\.m2ts" />
-                <!-- <data android:pathPattern=".*\\.m3u" /> -->
                 <data android:pathPattern=".*\\.m3u8" />
                 <data android:pathPattern=".*\\.mkv" />
                 <data android:pathPattern=".*\\.mov" />
@@ -187,7 +173,6 @@
                 <data android:pathPattern=".*\\.M2V" />
                 <data android:pathPattern=".*\\.M2T" />
                 <data android:pathPattern=".*\\.M2TS" />
-                <!-- <data android:pathPattern=".*\\.M3U" /> -->
                 <data android:pathPattern=".*\\.M3U8" />
                 <data android:pathPattern=".*\\.MKV" />
                 <data android:pathPattern=".*\\.MOV" />
@@ -226,9 +211,6 @@
                 <data android:pathPattern=".*\\.WMV" />
                 <data android:pathPattern=".*\\.WTV" />
                 <data android:pathPattern=".*\\.XESC" />
-
-                <!-- audio -->
-
                 <data android:pathPattern=".*\\.3ga" />
                 <data android:pathPattern=".*\\.a52" />
                 <data android:pathPattern=".*\\.aac" />
diff --git a/android/app/src/main/assets/capacitor.config.json b/android/app/src/main/assets/capacitor.config.json
@@ -1,5 +1,5 @@
 {
-	"appId": "io.ionic.starter",
+	"appId": "com.husudosu.mpvremote",
 	"appName": "MPV Remote",
 	"webDir": "dist",
 	"bundledWebRuntime": false
diff --git a/android/app/src/main/java/io/ionic/starter/MainActivity.java b/android/app/src/main/java/io/ionic/starter/MainActivity.java
@@ -1,4 +1,4 @@
-package io.ionic.starter;
+package com.husudosu.mpvremote;
 
 import com.getcapacitor.BridgeActivity;
 
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
@@ -2,6 +2,6 @@
 <resources>
     <string name="app_name">MPV Remote</string>
     <string name="title_activity_main">MPV Remote</string>
-    <string name="package_name">io.ionic.starter</string>
-    <string name="custom_url_scheme">io.ionic.starter</string>
+    <string name="package_name">com.husudosu.mpvremote</string>
+    <string name="custom_url_scheme">com.husudosu.mpvremote</string>
 </resources>
diff --git a/capacitor.config.json b/capacitor.config.json
@@ -1,6 +1,6 @@
 {
-	"appId": "io.ionic.starter",
-	"appName": "MPV Remote",
-	"webDir": "dist",
-	"bundledWebRuntime": false
+  "appId": "com.husudosu.mpvremote",
+  "appName": "MPV Remote",
+  "webDir": "dist",
+  "bundledWebRuntime": false
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mpv-remote",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "private": true,
   "description": "MPV remote",
   "scripts": {
diff --git a/src/Container.vue b/src/Container.vue
@@ -5,21 +5,26 @@
         <ion-content>
           <ion-list id="inbox-list">
             <ion-list-header>MPV Remote</ion-list-header>
-            <ion-select
-              class="serverSelect"
-              interface="action-sheet"
-              placeholder="No server selected"
-              :value="currentServerId"
-              @ionChange="setCurrentServer($event.target.value)"
-            >
-              <ion-select-option
-                v-for="server in servers"
-                :key="server.id"
-                :value="server.id"
+            <template v-if="servers.length > 0">
+              <ion-select
+                class="serverSelect"
+                interface="action-sheet"
+                placeholder="No server selected"
+                :value="currentServerId"
+                @ionChange="setCurrentServer($event.target.value)"
               >
-                {{ server.name }} ({{ server.host }}:{{ server.port }})
-              </ion-select-option>
-            </ion-select>
+                <ion-select-option
+                  v-for="server in servers"
+                  :key="server.id"
+                  :value="server.id"
+                >
+                  {{ server.name }} ({{ server.host }}:{{ server.port }})
+                </ion-select-option>
+              </ion-select>
+            </template>
+            <template v-else>
+              <div class="serverSelect">No server configured</div>
+            </template>
             <div class="horizontalLine"></div>
             <ion-menu-toggle
               auto-hide="false"
diff --git a/src/api.js b/src/api.js
@@ -20,15 +20,22 @@ function requestOnRejected(error) {
   Promise.reject(error);
 }
 
-export function configureInstance(host, port) {
+export function disconnect() {
+  store.commit("simpleapi/clearPlaybackRefreshInterval");
+  store.commit("simpleapi/setConnectedState", false);
+  store.commit("simpleapi/clearPlayerData");
   if (callsPending > 0) {
     callsPending = 0;
-    cancelSource.cancel("API reconfigure");
+    cancelSource.cancel("Cancel pending requests");
     cancelSource = axios.CancelToken.source();
   }
+}
+
+export function configureInstance(host, port) {
+  // Before reconfiguration set store states.
+  disconnect();
   apiInstance.defaults.baseURL = `http://${host}:${port}/api/v1/`;
   apiInstance.interceptors.request.use(requestOnFulfilled, requestOnRejected);
-  // Set active server
 }
 
 apiInstance.interceptors.response.use(
diff --git a/src/components/addServerModal.vue b/src/components/addServerModal.vue
@@ -102,6 +102,9 @@ export default {
     const onSubmitClicked = () => {
       // Validate server data
       let errors = [];
+      dialog.value.name = dialog.value.name.trim();
+      dialog.value.host = dialog.value.host.trim();
+
       if (dialog.value.name.length === 0) errors.push("Name required");
       if (dialog.value.host.length === 0) errors.push("Host required");
 
diff --git a/src/components/fileBrowserModal.vue b/src/components/fileBrowserModal.vue
diff --git a/src/dbcrud.js b/src/dbcrud.js
diff --git a/src/store/settings.module.js b/src/store/settings.module.js
diff --git a/src/verinfo.js b/src/verinfo.js
diff --git a/src/views/Servers.vue b/src/views/Servers.vue

Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,14 @@`
`4`	`4`	`"type": "APK",`
`5`	`5`	`"kind": "Directory"`
`6`	`6`	`},`
`7`		`- "applicationId": "io.ionic.starter",`
	`7`	`+ "applicationId": "com.husudosu.mpvremote",`
`8`	`8`	`"variantName": "release",`
`9`	`9`	`"elements": [`
`10`	`10`	`{`
`11`	`11`	`"type": "SINGLE",`
`12`	`12`	`"filters": [],`
`13`		`- "versionCode": 1,`
`14`		`- "versionName": "1.0.5",`
	`13`	`+ "versionCode": 6,`
	`14`	`+ "versionName": "1.0.6",`
`15`	`15`	`"outputFile": "app-release.apk"`
`16`	`16`	`}`
`17`	`17`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "appId": "io.ionic.starter",`
	`2`	`+ "appId": "com.husudosu.mpvremote",`
`3`	`3`	`"appName": "MPV Remote",`
`4`	`4`	`"webDir": "dist",`
`5`	`5`	`"bundledWebRuntime": false`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.ionic.starter;`
	`1`	`+package com.husudosu.mpvremote;`
`2`	`2`
`3`	`3`	`import com.getcapacitor.BridgeActivity;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "appId": "io.ionic.starter",`
`3`		`- "appName": "MPV Remote",`
`4`		`- "webDir": "dist",`
`5`		`- "bundledWebRuntime": false`
	`2`	`+ "appId": "com.husudosu.mpvremote",`
	`3`	`+ "appName": "MPV Remote",`
	`4`	`+ "webDir": "dist",`
	`5`	`+ "bundledWebRuntime": false`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "mpv-remote",`
`3`		`- "version": "1.0.5",`
	`3`	`+ "version": "1.0.6",`
`4`	`4`	`"private": true,`
`5`	`5`	`"description": "MPV remote",`
`6`	`6`	`"scripts": {`