Permalink
Browse files

- Revised sortable field validation

  • Loading branch information...
cozy1 committed Dec 11, 2018
1 parent 1bef255 commit 594ffef1a66af3bc4b804aa02bb5a6329e7ee163
@@ -1,14 +1,14 @@
{\rtf1\ansi\ansicpg1252\uc1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
{\f2\fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;}{\f3\froman\fcharset2\fprq2{\*\panose 05050102010706020507}Symbol;}{\f10\fnil\fcharset2\fprq2{\*\panose 05000000000000000000}Wingdings;}
{\f35\fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Tahoma;}{\f36\fswiss\fcharset0\fprq2{\*\panose 00000000000000000000}Microsoft Sans Serif;}{\f38\froman\fcharset238\fprq2 Times New Roman CE;}{\f39\froman\fcharset204\fprq2 Times New Roman Cyr;}
{\f41\froman\fcharset161\fprq2 Times New Roman Greek;}{\f42\froman\fcharset162\fprq2 Times New Roman Tur;}{\f43\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f44\froman\fcharset178\fprq2 Times New Roman (Arabic);}
{\f45\froman\fcharset186\fprq2 Times New Roman Baltic;}{\f46\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f58\fmodern\fcharset238\fprq1 Courier New CE;}{\f59\fmodern\fcharset204\fprq1 Courier New Cyr;}
{\f61\fmodern\fcharset161\fprq1 Courier New Greek;}{\f62\fmodern\fcharset162\fprq1 Courier New Tur;}{\f63\fmodern\fcharset177\fprq1 Courier New (Hebrew);}{\f64\fmodern\fcharset178\fprq1 Courier New (Arabic);}
{\f65\fmodern\fcharset186\fprq1 Courier New Baltic;}{\f66\fmodern\fcharset163\fprq1 Courier New (Vietnamese);}{\f388\fswiss\fcharset238\fprq2 Tahoma CE;}{\f389\fswiss\fcharset204\fprq2 Tahoma Cyr;}{\f391\fswiss\fcharset161\fprq2 Tahoma Greek;}
{\f392\fswiss\fcharset162\fprq2 Tahoma Tur;}{\f393\fswiss\fcharset177\fprq2 Tahoma (Hebrew);}{\f394\fswiss\fcharset178\fprq2 Tahoma (Arabic);}{\f395\fswiss\fcharset186\fprq2 Tahoma Baltic;}{\f396\fswiss\fcharset163\fprq2 Tahoma (Vietnamese);}
{\f397\fswiss\fcharset222\fprq2 Tahoma (Thai);}{\f398\fswiss\fcharset238\fprq2 Microsoft Sans Serif CE;}{\f399\fswiss\fcharset204\fprq2 Microsoft Sans Serif Cyr;}{\f401\fswiss\fcharset161\fprq2 Microsoft Sans Serif Greek;}
{\f402\fswiss\fcharset162\fprq2 Microsoft Sans Serif Tur;}{\f403\fswiss\fcharset177\fprq2 Microsoft Sans Serif (Hebrew);}{\f404\fswiss\fcharset178\fprq2 Microsoft Sans Serif (Arabic);}{\f405\fswiss\fcharset186\fprq2 Microsoft Sans Serif Baltic;}
{\f406\fswiss\fcharset163\fprq2 Microsoft Sans Serif (Vietnamese);}{\f407\fswiss\fcharset222\fprq2 Microsoft Sans Serif (Thai);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;
{\f35\fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Tahoma;}{\f36\fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Microsoft Sans Serif;}{\f74\froman\fcharset238\fprq2 Times New Roman CE;}{\f75\froman\fcharset204\fprq2 Times New Roman Cyr;}
{\f77\froman\fcharset161\fprq2 Times New Roman Greek;}{\f78\froman\fcharset162\fprq2 Times New Roman Tur;}{\f79\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f80\froman\fcharset178\fprq2 Times New Roman (Arabic);}
{\f81\froman\fcharset186\fprq2 Times New Roman Baltic;}{\f82\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f94\fmodern\fcharset238\fprq1 Courier New CE;}{\f95\fmodern\fcharset204\fprq1 Courier New Cyr;}
{\f97\fmodern\fcharset161\fprq1 Courier New Greek;}{\f98\fmodern\fcharset162\fprq1 Courier New Tur;}{\f99\fmodern\fcharset177\fprq1 Courier New (Hebrew);}{\f100\fmodern\fcharset178\fprq1 Courier New (Arabic);}
{\f101\fmodern\fcharset186\fprq1 Courier New Baltic;}{\f102\fmodern\fcharset163\fprq1 Courier New (Vietnamese);}{\f424\fswiss\fcharset238\fprq2 Tahoma CE;}{\f425\fswiss\fcharset204\fprq2 Tahoma Cyr;}{\f427\fswiss\fcharset161\fprq2 Tahoma Greek;}
{\f428\fswiss\fcharset162\fprq2 Tahoma Tur;}{\f429\fswiss\fcharset177\fprq2 Tahoma (Hebrew);}{\f430\fswiss\fcharset178\fprq2 Tahoma (Arabic);}{\f431\fswiss\fcharset186\fprq2 Tahoma Baltic;}{\f432\fswiss\fcharset163\fprq2 Tahoma (Vietnamese);}
{\f433\fswiss\fcharset222\fprq2 Tahoma (Thai);}{\f434\fswiss\fcharset238\fprq2 Microsoft Sans Serif CE;}{\f435\fswiss\fcharset204\fprq2 Microsoft Sans Serif Cyr;}{\f437\fswiss\fcharset161\fprq2 Microsoft Sans Serif Greek;}
{\f438\fswiss\fcharset162\fprq2 Microsoft Sans Serif Tur;}{\f439\fswiss\fcharset177\fprq2 Microsoft Sans Serif (Hebrew);}{\f440\fswiss\fcharset178\fprq2 Microsoft Sans Serif (Arabic);}{\f441\fswiss\fcharset186\fprq2 Microsoft Sans Serif Baltic;}
{\f442\fswiss\fcharset163\fprq2 Microsoft Sans Serif (Vietnamese);}{\f443\fswiss\fcharset222\fprq2 Microsoft Sans Serif (Thai);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;
\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}
{\stylesheet{\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 Normal;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\*
\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv
@@ -65,9 +65,9 @@
\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1685859046}}{\*\listoverridetable{\listoverride\listid845022685\listoverridecount0\ls1}{\listoverride\listid359166142
\listoverridecount0\ls2}{\listoverride\listid1333413571\listoverridecount0\ls3}{\listoverride\listid1685859046\listoverridecount0\ls4}{\listoverride\listid338965384\listoverridecount0\ls5}{\listoverride\listid1120688297\listoverridecount0\ls6}}
{\*\rsidtbl \rsid143938\rsid208069\rsid276887\rsid1010091\rsid1537877\rsid1596048\rsid2703131\rsid3495053\rsid4289800\rsid6300002\rsid7086855\rsid8091389\rsid8338931\rsid8457098\rsid8740629\rsid9002083\rsid9046583\rsid9456744\rsid9846673\rsid10357349
\rsid11038411\rsid11229351\rsid11405303\rsid12549519\rsid13112591\rsid13178679\rsid13443476\rsid13593537\rsid13636370\rsid13643383\rsid13981760\rsid14635904\rsid15667500}{\*\generator Microsoft Word 10.0.6612;}{\info{\author PowerUser}
{\operator PowerUser}{\creatim\yr2018\mo9\dy24\hr19\min15}{\revtim\yr2018\mo11\dy13\hr11\min12}{\printim\yr2018\mo11\dy5\hr10\min23}{\version33}{\edmins54}{\nofpages2}{\nofwords421}{\nofchars2404}{\*\company Cozumel}{\nofcharsws2820}{\vern16389}}
{\*\rsidtbl \rsid143938\rsid208069\rsid276887\rsid1010091\rsid1537877\rsid1596048\rsid2703131\rsid3495053\rsid4289800\rsid6300002\rsid7086855\rsid8091389\rsid8338931\rsid8457098\rsid8740629\rsid9002083\rsid9046583\rsid9201862\rsid9456744\rsid9846673
\rsid10357349\rsid11038411\rsid11229351\rsid11405303\rsid12549519\rsid13112591\rsid13178679\rsid13443476\rsid13593537\rsid13636370\rsid13643383\rsid13981760\rsid14635904\rsid15667500}{\*\generator Microsoft Word 10.0.6612;}{\info{\author PowerUser}
{\operator PowerUser}{\creatim\yr2018\mo9\dy24\hr19\min15}{\revtim\yr2018\mo12\dy6\hr18\min58}{\printim\yr2018\mo11\dy5\hr10\min23}{\version34}{\edmins55}{\nofpages2}{\nofwords431}{\nofchars2461}{\*\company Cozumel}{\nofcharsws2887}{\vern16389}}
\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind4\viewscale100\nolnhtadjtbl\rsidroot13643383 \fet0\sectd
\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4
\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}
@@ -77,6 +77,9 @@
\par What's new for the toolkit:
\par }\pard \ql \li0\ri0\widctlpar\faauto\rin0\lin0\itap0\pararsid11229351 {\f36\fs20\cf11\insrsid9046583\charrsid9046583 }{\f2\fs22\insrsid11229351
\par }\pard \ql \li0\ri0\widctlpar\faauto\rin0\lin0\itap0\pararsid9046583 {\f36\fs20\insrsid9046583\charrsid9046583
\par {\listtext\pard\plain\f3\fs20\cf1\insrsid9201862 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ql \fi-360\li360\ri0\widctlpar\jclisttab\tx360\faauto\ls6\rin0\lin360\itap0\pararsid11229351 {\f36\fs20\cf1\insrsid9201862
Revised sortable field validation to be more consistent with ODLC}{\f3\fs20\cf1\insrsid9201862\charrsid9201862
\par }\pard \ql \li0\ri0\widctlpar\faauto\rin0\lin0\itap0\pararsid9201862 {\f3\fs20\cf1\insrsid9201862\charrsid9201862
\par {\listtext\pard\plain\f3\fs20\cf1\insrsid1537877 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ql \fi-360\li360\ri0\widctlpar\jclisttab\tx360\faauto\ls6\rin0\lin360\itap0\pararsid11229351 {\f36\fs20\cf1\insrsid1537877
Added support to CDLC Creator to preserve tagger.org artwork}{\f3\fs20\cf1\insrsid1537877\charrsid1537877
\par }\pard \ql \li0\ri0\widctlpar\faauto\rin0\lin0\itap0\pararsid1537877 {\f3\fs20\cf1\insrsid1537877\charrsid1537877
@@ -96,8 +99,8 @@ Correctly set manifest boolean property \lquote }{\f36\fs20\cf1\insrsid8740629 S
\par {\listtext\pard\plain\f3\fs20\cf1\insrsid8457098 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ql \fi-360\li360\ri0\nowidctlpar\jclisttab\tx360\faauto\ls6\rin0\lin360\itap0\pararsid14635904 {\f36\fs20\cf1\insrsid8457098
Improved RS1 to RS2014 and RS2014 to RS1 conversions}{\f36\fs20\cf1\insrsid4289800 and }{\f36\fs20\cf1\insrsid8457098 better tone conversion}{\f36\fs20\cf1\insrsid4289800 s}{\f3\fs20\cf1\insrsid8457098\charrsid8457098
\par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid8457098 {\f3\fs20\cf1\insrsid8457098\charrsid8457098
\par {\listtext\pard\plain\f3\fs20\cf1\insrsid9456744 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ql \fi-360\li360\ri0\nowidctlpar\jclisttab\tx360\faauto\ls6\rin0\lin360\itap0\pararsid14635904 {\f36\fs20\cf1\insrsid9456744
Improved RS1 Import Package function to collect more accurate package data.}{\f3\fs20\cf1\insrsid9456744\charrsid9456744
\par {\listtext\pard\plain\f3\fs20\cf1\insrsid9456744 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ql \fi-360\li360\ri0\nowidctlpar\jclisttab\tx360\faauto\ls6\rin0\lin360\itap0\pararsid14635904 {\f36\fs20\cf1\insrsid9456744 Improved RS
1 Import Package function to collect more accurate package data.}{\f3\fs20\cf1\insrsid9456744\charrsid9456744
\par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid9456744 {\f3\fs20\cf1\insrsid9456744\charrsid9456744
\par {\listtext\pard\plain\f3\fs20\cf1\insrsid9846673 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ql \fi-360\li360\ri0\nowidctlpar\jclisttab\tx360\faauto\ls6\rin0\lin360\itap0\pararsid14635904 {\f36\fs20\cf1\insrsid9846673
Add arrangement represent (Default/Bonus/Alternate) validation to CDLC Creator.}{\f3\fs20\cf1\insrsid9846673\charrsid9846673
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.1.0")]
[assembly: AssemblyInformationalVersion("4aeff654")]
[assembly: AssemblyInformationalVersion("1bef2558")]
[assembly: AssemblyConfiguration("BETA")]
@@ -442,6 +442,7 @@ public void GenerateChordTemplateData(IAttributes attribute, dynamic song)
}
}

// TODO: Trace Code
public void GenerateDynamicVisualDensity(IAttributes attribute, dynamic song, Arrangement arrangement, GameVersion version)
{
if (arrangement.ArrangementType == ArrangementType.Vocal)
@@ -54,7 +54,7 @@ public class AttributesHeader2014
public double? NotesMedium { get; set; }
public int? Representative { get; set; } // Header only
public int? RouteMask { get; set; } // Header only
public bool Shipping { get; set; }
public bool Shipping { get; set; } // false = hidden arrangement
public string SKU { get; set; } // determines tag text in setlist
public double? SongDiffEasy { get; set; }
public double? SongDiffHard { get; set; }
@@ -101,11 +101,11 @@ public AttributesHeader2014(string arrangementFileName, Arrangement arrangement,
ManifestUrn = jsonUrn;
MasterID_RDV = arrangement.MasterId; // must be unique else in-game hang occures
PersistentID = arrangement.Id.ToString().Replace("-", "").ToUpper();
Shipping = true;
Shipping = true; // false = hides the arrangement in-game

// DLC property controls whether album artwork marker is shown in-game setlist, but
// has side effect that 'Alternate Arrangements' are locked for newer player profiles
DLC = true;
DLC = true; // false = requires UPlay to unlock

// TODO: monitor this change
if (info.ToolkitInfo == null || info.ToolkitInfo.PackageAuthor == "Ubisoft")
@@ -254,7 +254,8 @@ public static string GetValidSortableName(this string value)
value = value.ShortWordMover(); // "The Beatles" becomes "Beatles, The"
value = value.Capitalize(); // "blink-182" becomes "Blink 182"
value = value.StripExcessWhiteSpace();
value = value.Replace(".", ""); // Remove periods from sortable fields, it screws up file naming ...
// remove periods from sortable fields, periods screw up file naming
value = value.Replace(".", "");

return value;
}
@@ -554,8 +555,9 @@ public static string ShortWordMover(this string value, bool undoIt = false)
if (String.IsNullOrEmpty(value))
return String.Empty;

var shortWord = new string[] { "The ", "THE ", "the ", "A ", "a " };
var newEnding = new string[] { ", The", ", THE", ", the", ", A", ", a" };
// Artist Sort may begin with "A ", e.g. 'A Flock of Seaguls'
var shortWord = new string[] { "The ", "THE ", "the " };
var newEnding = new string[] { ", The", ", THE", ", the" };

for (int i = 0; i < shortWord.Length; i++)
{
@@ -27,5 +27,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.1.0")]
[assembly: AssemblyInformationalVersion("4aeff654")]
[assembly: AssemblyInformationalVersion("1bef2558")]
[assembly: AssemblyConfiguration("BETA")]
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.1.0")]
[assembly: AssemblyInformationalVersion("4aeff654")]
[assembly: AssemblyInformationalVersion("1bef2558")]
[assembly: AssemblyConfiguration("BETA")]
@@ -1,3 +1,3 @@
2.9.1.0
4aeff654
1bef2558
BETA

0 comments on commit 594ffef

Please sign in to comment.