caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #1540 from jotomo/upstream-1480

Browse source 
Profile switch name mangling for NS up/download
This commit is contained in:
Milos Kozak 2018-11-18 22:37:57 +01:00 committed by GitHub
commit 8110bef68f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
View file

@ -101,6 +101,11 @@ public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
return profile; return profile;
} }
/**
* Note: the name returned here is used as the PS name when uploading to NS. When such a PS is retrieved
* again from NS, the added parts must be removed again, see
* {@link info.nightscout.utils.PercentageSplitter#pureName}
*/
public String getCustomizedName() { public String getCustomizedName() {
String name = profileName; String name = profileName;
if(LocalProfilePlugin.LOCAL_PROFILE.equals(name)){ if(LocalProfilePlugin.LOCAL_PROFILE.equals(name)){

24
app/src/main/java/info/nightscout/utils/PercentageSplitter.java
View file

@ -8,23 +8,15 @@ import java.util.regex.Pattern;
*/ */
public class PercentageSplitter { public class PercentageSplitter {
// "Profile name (200%,2h)" // Matches "Profile name (200%,-2h)", "Profile name (50%)
private static final Pattern percentagePattern = Pattern.compile("(.+)\\(\\d+%,\\d+h\\)"); private static final Pattern splitPattern = Pattern.compile("(.+)\\(\\d+%(,-?\\d+h)?\\)");
// "Profile name (200%)"
private static final Pattern percentageShiftPattern = Pattern.compile("(.+)\\(\\d+%\\)");
/** Removes the suffix for percentage and timeshift from a profile name. */ /** Removes the suffix for percentage and timeshift from a profile name. This is the inverse of what
* {@link info.nightscout.androidaps.db.ProfileSwitch#getCustomizedName()} does.
* Since the customized name is used for the PS upload to NS, this is needed get the original profile name
* when retrieving the PS from NS again. */
public static String pureName(String name) { public static String pureName(String name) {
Matcher percentageMatch = percentagePattern.matcher(name); Matcher percentageMatch = splitPattern.matcher(name);
if (percentageMatch.find()) { return percentageMatch.find() ? percentageMatch.group(1).trim() : name;
return percentageMatch.group(1).trim();
}
Matcher percentageShiftMatch = percentageShiftPattern.matcher(name);
if (percentageShiftMatch.find()) {
return percentageShiftMatch.group(1).trim();
}
return name;
} }
} }

7
app/src/test/java/info/nightscout/utils/PercentageSplitterTest.java
View file

@ -19,7 +19,12 @@ public class PercentageSplitterTest {
} }
@Test @Test
public void pureNameTestPercentageAndShift() { public void pureNameTestPercentageAndPositiveTimeShift() {
assertEquals("Fiasp", PercentageSplitter.pureName("Fiasp (101%,2h)")); assertEquals("Fiasp", PercentageSplitter.pureName("Fiasp (101%,2h)"));
} }
@Test
public void pureNameTestPercentageAndNegtiveTimeShift() {
assertEquals("Fiasp", PercentageSplitter.pureName("Fiasp (50%,-2h)"));
}
} }