Skip to content

Commit 4f6033e

Browse files
author
Chris Bellew
committed
Respond to "play" the same way we respond to "watch".
1 parent 6965110 commit 4f6033e

File tree

4 files changed

+43
-43
lines changed

4 files changed

+43
-43
lines changed

‎mobile/src/main/java/com/atomjack/vcfp/services/PlexSearchService.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ public void run() {
431431
p = Pattern.compile( getString(R.string.pattern_watch_movie), Pattern.DOTALL);
432432
matcher = p.matcher(queryText);
433433
if(matcher.find()) {
434-
final String queryTerm = matcher.group(1);
434+
final String queryTerm = matcher.group(2);
435435
return new myRunnable() {
436436
@Override
437437
public void run() {
@@ -444,9 +444,9 @@ public void run() {
444444
matcher = p.matcher(queryText);
445445

446446
if(matcher.find()) {
447-
final String queryTerm = matcher.group(3);
448-
final String season = matcher.group(1);
449-
final String episode = matcher.group(2);
447+
final String queryTerm = matcher.group(4);
448+
final String season = matcher.group(2);
449+
final String episode = matcher.group(3);
450450
return new myRunnable() {
451451
@Override
452452
public void run() {
@@ -459,9 +459,9 @@ public void run() {
459459
matcher = p.matcher(queryText);
460460

461461
if(matcher.find()) {
462-
final String queryTerm = matcher.group(1);
463-
final String season = matcher.group(2);
464-
final String episode = matcher.group(3);
462+
final String queryTerm = matcher.group(2);
463+
final String season = matcher.group(3);
464+
final String episode = matcher.group(4);
465465
return new myRunnable() {
466466
@Override
467467
public void run() {
@@ -473,8 +473,8 @@ public void run() {
473473
p = Pattern.compile(getString(R.string.pattern_watch_episode_of_show));
474474
matcher = p.matcher(queryText);
475475
if(matcher.find()) {
476-
final String episodeSpecified = matcher.group(1);
477-
final String showSpecified = matcher.group(2);
476+
final String episodeSpecified = matcher.group(2);
477+
final String showSpecified = matcher.group(3);
478478
return new myRunnable() {
479479
@Override
480480
public void run() {
@@ -488,7 +488,7 @@ public void run() {
488488
matcher = p.matcher(queryText);
489489

490490
if(matcher.find()) {
491-
final String queryTerm = matcher.group(1);
491+
final String queryTerm = matcher.group(2);
492492
return new myRunnable() {
493493
@Override
494494
public void run() {
@@ -501,7 +501,7 @@ public void run() {
501501
matcher = p.matcher(queryText);
502502

503503
if(matcher.find()) {
504-
final String queryTerm = matcher.group(2);
504+
final String queryTerm = matcher.group(3);
505505
Logger.d("found latest: %s", queryTerm);
506506
return new myRunnable() {
507507
@Override
@@ -514,8 +514,8 @@ public void run() {
514514
p = Pattern.compile(getString(R.string.pattern_watch_show_episode_named));
515515
matcher = p.matcher(queryText);
516516
if(matcher.find()) {
517-
final String episodeSpecified = matcher.group(2);
518-
final String showSpecified = matcher.group(1);
517+
final String episodeSpecified = matcher.group(3);
518+
final String showSpecified = matcher.group(2);
519519
return new myRunnable() {
520520
@Override
521521
public void run() {
@@ -528,7 +528,7 @@ public void run() {
528528
matcher = p.matcher(queryText);
529529

530530
if(matcher.find()) {
531-
final String queryTerm = matcher.group(1);
531+
final String queryTerm = matcher.group(2);
532532
return new myRunnable() {
533533
@Override
534534
public void run() {

‎mobile/src/main/res/values-es/patterns.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ adding translations, please do not modify (.*), $1, ([0-9]+), etc.
1212
<item name="pattern_recognition" type="string">^(((ver|continuar viendo|escuchar|ver película) (.+)( en (.+))?( en modo aleatorio)?)|((posición) (.+)( en (.+))?)|((pausar|detener|continuar) reproducción( en (.+))?))|(conectar a (.+)|desconectar)$</item>
1313

1414
<item name="pattern_on_client" type="string">(.+) en (.+)$</item>
15-
<item name="pattern_resume_watching" type="string">^continuar viendo (.+)</item>
15+
<item name="pattern_resume_watching" type="string">^continuar (viendo) (.+)</item>
1616
<item name="pattern_on_shuffle" type="string"> en modo aleatorio$</item>
17-
<item name="pattern_watch" type="string">ver $1</item>
18-
<item name="pattern_watch_movie" type="string">ver película (.+)</item>
19-
<item name="pattern_watch_season_episode_of_show" type="string">ver temporada ([0-9]+) episodio ([0-9]+) de (.+)</item>
20-
<item name="pattern_watch_show_season_episode" type="string">ver (.+) temporada ([0-9]+) episodio ([0-9]+)</item>
21-
<item name="pattern_watch_episode_of_show" type="string">ver el episodio (.+) de (.+)</item>
22-
<item name="pattern_watch_next_episode_of_show" type="string">ver el siguiente episodio de (.+)</item>
23-
<item name="pattern_watch_latest_episode_of_show" type="string">ver( el)? último episodio de (.+)</item>
24-
<item name="pattern_watch_show_episode_named" type="string">ver (.+) episodio (.+)</item>
17+
<item name="pattern_watch" type="string">(ver) $1</item>
18+
<item name="pattern_watch_movie" type="string">(ver) película (.+)</item>
19+
<item name="pattern_watch_season_episode_of_show" type="string">(ver) temporada ([0-9]+) episodio ([0-9]+) de (.+)</item>
20+
<item name="pattern_watch_show_season_episode" type="string">(ver) (.+) temporada ([0-9]+) episodio ([0-9]+)</item>
21+
<item name="pattern_watch_episode_of_show" type="string">(ver) el episodio (.+) de (.+)</item>
22+
<item name="pattern_watch_next_episode_of_show" type="string">(ver) el siguiente episodio de (.+)</item>
23+
<item name="pattern_watch_latest_episode_of_show" type="string">(ver)( el)? último episodio de (.+)</item>
24+
<item name="pattern_watch_show_episode_named" type="string">(ver) (.+) episodio (.+)</item>
2525
<item name="pattern_connect_to" type="string">^conectar a (.+)</item>
2626
<item name="pattern_disconnect" type="string">^desconectar$</item>
27-
<item name="pattern_watch2" type="string">ver (.+)</item>
27+
<item name="pattern_watch2" type="string">(ver) (.+)</item>
2828

2929
<!--
3030
The following pattern lets the user say "listen to <album> by <artist>" or

‎mobile/src/main/res/values-fr/patterns.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ adding translations, please do not modify (.*), $1, ([0-9]+), etc.
1212
<item name="pattern_recognition" type="string">^(((regarder|reprendre lecture|écouter|regarder film) (.+)( sur (.+))?)|((position) (.+)( sur (.+))?)|((pauser|reprendre|arrêter) lecture( sur (.+))?))$</item>
1313

1414
<item name="pattern_on_client" type="string">(.+) sur (.+)$</item>
15-
<item name="pattern_resume_watching" type="string">^reprendre lecture (.+)</item>
16-
<item name="pattern_watch" type="string">regarder $1</item>
17-
<item name="pattern_watch_movie" type="string">regarder film (.+)</item>
18-
<item name="pattern_watch_season_episode_of_show" type="string">regarder saison ([0-9]+) épisode ([0-9]+) of (.+)</item>
19-
<item name="pattern_watch_show_season_episode" type="string">regarder (.+) saison ([0-9]+) épisode ([0-9]+)</item>
20-
<item name="pattern_watch_episode_of_show" type="string">regarder épisode (.+) of (.+)</item>
21-
<item name="pattern_watch_next_episode_of_show" type="string">regarder( le)? prochain épisode de (.+)</item>
22-
<item name="pattern_watch_latest_episode_of_show" type="string">regarder( le)? dernier épisode de (.+)</item>
23-
<item name="pattern_watch_show_episode_named" type="string">regarder (.+) épisode (.+)</item>
24-
<item name="pattern_watch2" type="string">regarder (.+)</item>
15+
<item name="pattern_resume_watching" type="string">^reprendre (lecture) (.+)</item>
16+
<item name="pattern_watch" type="string">(regarder) $1</item>
17+
<item name="pattern_watch_movie" type="string">(regarder) film (.+)</item>
18+
<item name="pattern_watch_season_episode_of_show" type="string">(regarder) saison ([0-9]+) épisode ([0-9]+) of (.+)</item>
19+
<item name="pattern_watch_show_season_episode" type="string">(regarder) (.+) saison ([0-9]+) épisode ([0-9]+)</item>
20+
<item name="pattern_watch_episode_of_show" type="string">(regarder) épisode (.+) of (.+)</item>
21+
<item name="pattern_watch_next_episode_of_show" type="string">(regarder)( le)? prochain épisode de (.+)</item>
22+
<item name="pattern_watch_latest_episode_of_show" type="string">(regarder)( le)? dernier épisode de (.+)</item>
23+
<item name="pattern_watch_show_episode_named" type="string">(regarder) (.+) épisode (.+)</item>
24+
<item name="pattern_watch2" type="string">(regarder) (.+)</item>
2525

2626
<!--
2727
The following pattern lets the user say "listen to <album> by <artist>" or

‎mobile/src/main/res/values/patterns.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ adding translations, please do not modify (.*), $1, ([0-9]+), etc.
1414
<item name="pattern_on_client" type="string">(.+) on (.+)$</item>
1515
<item name="pattern_resume_watching" type="string">^resume (watching|playing) (.+)</item>
1616
<item name="pattern_on_shuffle" type="string"> on shuffle$</item>
17-
<item name="pattern_watch" type="string">watch|play $1</item>
18-
<item name="pattern_watch_movie" type="string">watch|play movie (.+)</item>
19-
<item name="pattern_watch_season_episode_of_show" type="string">watch|play season ([0-9]+) episode ([0-9]+) of (.+)</item>
20-
<item name="pattern_watch_show_season_episode" type="string">watch|play (.+) season ([0-9]+) episode ([0-9]+)</item>
21-
<item name="pattern_watch_episode_of_show" type="string">watch|play episode (.+) of (.+)</item>
22-
<item name="pattern_watch_next_episode_of_show" type="string">watch|play the next episode of (.+)</item>
23-
<item name="pattern_watch_latest_episode_of_show" type="string">watch|play( the)? latest episode of (.+)</item>
24-
<item name="pattern_watch_show_episode_named" type="string">watch|play (.+) episode (.+)</item>
17+
<item name="pattern_watch" type="string">(watch|play) $1</item>
18+
<item name="pattern_watch_movie" type="string">(watch|play) movie (.+)</item>
19+
<item name="pattern_watch_season_episode_of_show" type="string">(watch|play) season ([0-9]+) episode ([0-9]+) of (.+)</item>
20+
<item name="pattern_watch_show_season_episode" type="string">(watch|play) (.+) season ([0-9]+) episode ([0-9]+)</item>
21+
<item name="pattern_watch_episode_of_show" type="string">(watch|play) episode (.+) of (.+)</item>
22+
<item name="pattern_watch_next_episode_of_show" type="string">(watch|play) the next episode of (.+)</item>
23+
<item name="pattern_watch_latest_episode_of_show" type="string">(watch|play)( the)? latest episode of (.+)</item>
24+
<item name="pattern_watch_show_episode_named" type="string">(watch|play) (.+) episode (.+)</item>
2525
<item name="pattern_connect_to" type="string">^connect to (.+)</item>
2626
<item name="pattern_disconnect" type="string">^disconnect$</item>
27-
<item name="pattern_watch2" type="string">watch|play (.+)</item>
27+
<item name="pattern_watch2" type="string">(watch|play) (.+)</item>
2828

2929
<!--
3030
The following pattern lets the user say "listen to <album> by <artist>" or

0 commit comments

Comments
 (0)