From 85736dccdf3c6714e24415f5572d1415a64be118 Mon Sep 17 00:00:00 2001
From: samcm <sam_cm_to@hotmail.com>
Date: Sun, 24 Dec 2017 01:41:40 +1100
Subject: [PATCH] Unifying walkthrough/joinroom

---
 src/components/application/joinroom.vue      |  8 +-
 src/store/modules/plex/helpers/PlexClient.js | 84 +++++++++-----------
 2 files changed, 43 insertions(+), 49 deletions(-)

diff --git a/src/components/application/joinroom.vue b/src/components/application/joinroom.vue
index 0ca470f2..9b9e22c8 100644
--- a/src/components/application/joinroom.vue
+++ b/src/components/application/joinroom.vue
@@ -19,19 +19,19 @@
       </v-flex>
     </v-layout> 
     <v-layout row wrap justify-center>
-      <v-flex xs10>
+      <v-flex xs10 lg8 xl6>
         <h3 class="text-xs-center">Connect to a SyncLounge room</h3>
       </v-flex>
     </v-layout>
     <v-layout row wrap justify-center>
-      <v-flex xs10 lg6>
+      <v-flex xs10 lg8 xl6>
         <p class="pa-2">
           It's time to connect to SyncLounge. From the list select a server which is closest to your location. Once you've chosen one that works for you it's time to create a room for your friends to join.
         </p>
       </v-flex>
     </v-layout>
     <v-layout row wrap justify-center>
-      <v-flex xs10 lg6 v-if="!context.getters.getConnected" style="color:white !important">
+      <v-flex xs10 lg8 xl6 v-if="!context.getters.getConnected" style="color:white !important">
         <v-select
           v-bind:items="ptservers"
           class="input-group--focused pt-input"
@@ -69,7 +69,7 @@
       </v-flex>     
     </v-layout>
     <v-layout row wrap justify-center>
-      <v-flex xs10 lg6 v-if="context.getters.getConnected">
+      <v-flex xs10 lg8 xl6 v-if="context.getters.getConnected">
         <v-layout row wrap>
           <v-flex xs12>          
             <v-text-field
diff --git a/src/store/modules/plex/helpers/PlexClient.js b/src/store/modules/plex/helpers/PlexClient.js
index 5f6c6933..de12d16f 100644
--- a/src/store/modules/plex/helpers/PlexClient.js
+++ b/src/store/modules/plex/helpers/PlexClient.js
@@ -143,9 +143,6 @@ module.exports = function PlexClient () {
   }
 
   this.updateTimelineObject = function (result) {
-
-
-
     this.setValue('lastTimelineObject', result)
     this.lastTimelineObject = result    
     this.events.emit('new_timeline', result)
@@ -349,60 +346,58 @@ module.exports = function PlexClient () {
     })
   }
 
-  this.playMedia = function (data) {
+  this.playMedia = async function (data) {
     // Play a media item given a mediaId key and a server to play from
     // We need the following variables to build our paramaters:
     // MediaId Key, Offset, server MachineId,
     // Server Ip, Server Port, Server Protocol, Path
-    var that = this
-    // First lets mirror the item so the user has an idea of what we're about to play
 
-    const send = () => {
-      let command = '/player/playback/playMedia'
-      let mediaId = '/library/metadata/' + data.ratingKey
-      let offset = data.offset || 0
-      let serverId = data.server.clientIdentifier
-      let address = data.server.chosenConnection.address
-      let port = data.server.chosenConnection.port
-      let protocol = data.server.chosenConnection.protocol
-      let path = data.server.chosenConnection.uri + mediaId
+    // First we will mirror the item so the user has an idea of what we're about to play
 
-      let params = {
-        'X-Plex-Client-Identifier': 'SyncLounge',
-        'key': mediaId,
-        'offset': offset,
-        'machineIdentifier': serverId,
-        'address': address,
-        'port': port,
-        'protocol': protocol,
-        'path': path,
-        'wait': 0,
-        'token': data.server.accessToken
+      const send = async () => {
+        let command = '/player/playback/playMedia'
+        let mediaId = '/library/metadata/' + data.ratingKey
+        let offset = data.offset || 0
+        let serverId = data.server.clientIdentifier
+        let address = data.server.chosenConnection.address
+        let port = data.server.chosenConnection.port
+        let protocol = data.server.chosenConnection.protocol
+        let path = data.server.chosenConnection.uri + mediaId
+  
+        let params = {
+          'X-Plex-Client-Identifier': 'SyncLounge',
+          'key': mediaId,
+          'offset': offset,
+          'machineIdentifier': serverId,
+          'address': address,
+          'port': port,
+          'protocol': protocol,
+          'path': path,
+          'wait': 0,
+          'token': data.server.accessToken
+        }
+  
+        if (data.mediaIndex != undefined || data.mediaIndex != null){
+          params.mediaIndex = data.mediaIndex
+        }
+  
+        // Now that we've built our params, it's time to hit the client api
+        await this.hitApi(command, params, that.chosenConnection)
+        return true
       }
-
-      if (data.mediaIndex != undefined || data.mediaIndex != null){
-        params.mediaIndex = data.mediaIndex
+  
+      if (this.clientIdentifier == 'PTPLAYER9PLUS10') {
+        return send()
+      } else {
+        await this.mirrorContent(data.ratingKey, data.server)
+        return send()
       }
-
-      // Now that we've built our params, it's time to hit the client api
-      return this.hitApi(command, params, that.chosenConnection)
-    }
-
-    if (this.clientIdentifier == 'PTPLAYER9PLUS10') {
-      send()
-    } else {
-      this.mirrorContent(data.ratingKey, data.server, function () {
-        send()
-      })
-    }
-
   }
   this.mirrorContent = function (key, serverObject, callback) {
     // Mirror a media item given a mediaId key and a server to play from
     // We need the following variables to build our paramaters:
     // MediaId Key, Offset (0 for simplicity), server MachineId,
     // Server Ip, Server Port, Server Protocol, Path
-    console.log('Trying to mirror content')
 
     let command = '/player/mirror/details'
     let mediaId = '/library/metadata/' + key
@@ -468,8 +463,7 @@ module.exports = function PlexClient () {
           }
         })
       }
-      doRequest()
-    
+      doRequest()    
     })
     
   }