Refactor capacitor plugins, clean up and organize android plugin classes

This commit is contained in:
advplyr
2022-04-04 19:08:27 -05:00
parent cc744bb975
commit 77ef0c119b
26 changed files with 376 additions and 385 deletions
+2 -2
View File
@@ -35,7 +35,7 @@
<script>
import { AppUpdate } from '@robingenz/capacitor-app-update'
import MyNativeAudio from '@/plugins/my-native-audio'
import { AbsAudioPlayer } from '@/plugins/capacitor'
export default {
asyncData({ redirect, store }) {
@@ -82,7 +82,7 @@ export default {
// Used for testing API
console.log('Making Test call')
var libraryId = this.$store.state.libraries.currentLibraryId
MyNativeAudio.getLibraryItems({ libraryId }).then((res) => {
AbsAudioPlayer.getLibraryItems({ libraryId }).then((res) => {
console.log('TEST CALL response', JSON.stringify(res))
})
},
+5 -2
View File
@@ -35,7 +35,7 @@ export default {
data() {
return {
shelves: [],
loading: true
loading: false
}
},
computed: {
@@ -87,11 +87,14 @@ export default {
return categories
},
async fetchCategories() {
if (this.loading) {
console.log('Already loading categories')
return
}
this.loading = true
this.shelves = []
var localCategories = await this.getLocalMediaItemCategories()
console.log('Category shelves', localCategories.length)
this.shelves = this.shelves.concat(localCategories)
if (this.user || !this.currentLibraryId) {
+3 -4
View File
@@ -67,8 +67,7 @@
<script>
import { Dialog } from '@capacitor/dialog'
import AudioDownloader from '@/plugins/audio-downloader'
import StorageManager from '@/plugins/storage-manager'
import { AbsFileSystem, AbsDownloader } from '@/plugins/capacitor'
export default {
async asyncData({ store, params, redirect, app }) {
@@ -239,7 +238,7 @@ export default {
},
async selectFolder() {
// Select and save the local folder for media type
var folderObj = await StorageManager.selectFolder({ mediaType: this.mediaType })
var folderObj = await AbsFileSystem.selectFolder({ mediaType: this.mediaType })
if (folderObj.error) {
return this.$toast.error(`Error: ${folderObj.error || 'Unknown Error'}`)
}
@@ -296,7 +295,7 @@ export default {
},
async startDownload(localFolder) {
console.log('Starting download to local folder', localFolder.name)
var downloadRes = await AudioDownloader.downloadLibraryItem({ libraryItemId: this.libraryItemId, localFolderId: localFolder.id })
var downloadRes = await AbsDownloader.downloadLibraryItem({ libraryItemId: this.libraryItemId, localFolderId: localFolder.id })
if (downloadRes.error) {
var errorMsg = downloadRes.error || 'Unknown error'
console.error('Download error', errorMsg)
+3 -3
View File
@@ -35,7 +35,7 @@
<script>
import { Capacitor } from '@capacitor/core'
import { Dialog } from '@capacitor/dialog'
import StorageManager from '@/plugins/storage-manager'
import { AbsFileSystem } from '@/plugins/capacitor'
export default {
asyncData({ params, query }) {
@@ -75,7 +75,7 @@ export default {
})
if (value) {
this.removingFolder = true
await StorageManager.removeFolder({ folderId: this.folderId })
await AbsFileSystem.removeFolder({ folderId: this.folderId })
this.removingFolder = false
this.$router.replace('/localMedia/folders')
}
@@ -85,7 +85,7 @@ export default {
},
async scanFolder(forceAudioProbe = false) {
this.isScanning = true
var response = await StorageManager.scanFolder({ folderId: this.folderId, forceAudioProbe })
var response = await AbsFileSystem.scanFolder({ folderId: this.folderId, forceAudioProbe })
if (response && response.localMediaItems) {
var itemsAdded = response.itemsAdded
+3 -3
View File
@@ -26,7 +26,7 @@
</template>
<script>
import StorageManager from '@/plugins/storage-manager'
import { AbsFileSystem } from '@/plugins/capacitor'
export default {
data() {
@@ -58,7 +58,7 @@ export default {
if (!this.newFolderMediaType) {
return this.$toast.error('Must select a media type')
}
var folderObj = await StorageManager.selectFolder({ mediaType: this.newFolderMediaType })
var folderObj = await AbsFileSystem.selectFolder({ mediaType: this.newFolderMediaType })
if (folderObj.error) {
return this.$toast.error(`Error: ${folderObj.error || 'Unknown Error'}`)
}
@@ -70,7 +70,7 @@ export default {
this.localFolders.push(folderObj)
}
var permissionsGood = await StorageManager.checkFolderPermissions({ folderUrl: folderObj.contentUrl })
var permissionsGood = await AbsFileSystem.checkFolderPermissions({ folderUrl: folderObj.contentUrl })
if (!permissionsGood) {
this.$toast.error('Folder permissions failed')