From 9f5b5febeae4f393e8372c5504a3107233508810 Mon Sep 17 00:00:00 2001
From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Sat, 19 Jun 2010 19:09:20 +0000
Subject: [PATCH] ImportConsole now uses NConsoler (third-party) to parse
 command-line args; some bugfixes in userlist and pageouter

---
 Builder/IISMainHandler/build.txt              |   2 +-
 Builder/IISMainHandler/product.wxs            |  14 +++-
 IISMainHandler/PageOuter.cs                   |  10 ++-
 IISMainHandler/handlers/BoardHandler.cs       |   2 +-
 IISMainHandler/handlers/ThreadHandler.cs      |   3 +-
 .../handlers/response/BoardAsThread.cs        |   2 +-
 .../handlers/response/UserListHandler.cs      |   2 +-
 ImportConsole/ImportConsole.csproj            |   4 +
 ImportConsole/Program.cs                      |  70 +++++++++++-------
 ThirdParty/NConsoler/NConsoler.dll            | Bin 0 -> 32768 bytes
 templates/Full/UserList.xslt                  |   2 +-
 11 files changed, 71 insertions(+), 40 deletions(-)
 create mode 100644 ThirdParty/NConsoler/NConsoler.dll

diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index 8a32cf7..a9d8b73 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-250
\ No newline at end of file
+257
\ No newline at end of file
diff --git a/Builder/IISMainHandler/product.wxs b/Builder/IISMainHandler/product.wxs
index eb4d903..f7cfb3d 100644
--- a/Builder/IISMainHandler/product.wxs
+++ b/Builder/IISMainHandler/product.wxs
@@ -61,6 +61,9 @@
 			<Component Id="ImportConsole.pdb" Guid="6E5DCF23-7247-4DE0-BB6D-1A8463723437">
 				<File Id="ImportConsole.pdb" Source="..\..\ImportConsole\bin\Release\ImportConsole.pdb" KeyPath="yes" Checksum="yes"/>
 			</Component>
+			<Component Id="NConsoler.dll" Guid="F39FD087-8961-4871-9D59-FDB83002BC91">
+				<File Id="NConsoler.dll" Source="..\..\ThirdParty\NConsoler\NConsoler.dll" KeyPath="yes" Checksum="yes"/>
+			</Component>
 			<!--Component Id="MySql.Data.dll" Guid="90646729-6B21-4BEE-94C3-F39F5288EFB3">
 				<File Id="MySql.Data.dll" Source="..\..\ThirdParty\mysql-connector-net-6.2.3\MySql.Data\Provider\bin\Release\MySql.Data.dll" KeyPath="yes" Checksum="yes"/>
 			</Component>
@@ -105,12 +108,15 @@
 			<ComponentRef Id='MySQLConnector.dll' />
 			<ComponentRef Id='MySQLConnector.pdb' />
 		</Feature>
-		<!--Feature Id='ThirdParty' Title='ThirdParty libraries/tools' Level='1'>
-			<Feature Id='MySql.Data' Title='MySql Connector/NET' Level='1'>
+		<Feature Id='ThirdParty' Title='ThirdParty libraries/tools' Level='1'>
+			<Feature Id='NConsoler' Title='NConsoler' Level='1'>
+				<ComponentRef Id='NConsoler.dll' />
+			</Feature>
+			<!--Feature Id='MySql.Data' Title='MySql Connector/NET' Level='1'>
 				<ComponentRef Id='MySql.Data.dll' />
 				<ComponentRef Id='MySql.Data.pdb' />
-			</Feature>
-		</Feature-->
+			</Feature-->
+		</Feature>
 		<Feature Id="Data" Title="Various data sets" Level="1">
 			<ComponentRef Id="_7z.exe"/>
 			<Feature Id="Templates" Title="Templates" Level="1">
diff --git a/IISMainHandler/PageOuter.cs b/IISMainHandler/PageOuter.cs
index 8bc2f17..bc79f76 100644
--- a/IISMainHandler/PageOuter.cs
+++ b/IISMainHandler/PageOuter.cs
@@ -41,13 +41,17 @@ namespace FLocal.IISHandler {
 			}
 		}
 
-		public static PageOuter createFromGet(string[] requestParts, long perPage, Dictionary<char, Func<long>> customAction) {
+		/*public static PageOuter createFromGet(string[] requestParts, long perPage, Dictionary<char, Func<long>> customAction) {
 			return createFromGet(requestParts, perPage, customAction, 2);
+		}*/
+
+		public static PageOuter createFromGet(string[] requestParts, long perPage, int offset) {
+			return createFromGet(requestParts, perPage, new Dictionary<char, Func<long>>(), offset);
 		}
 
-		public static PageOuter createFromGet(string[] requestParts, long perPage) {
+		/*public static PageOuter createFromGet(string[] requestParts, long perPage) {
 			return createFromGet(requestParts, perPage, new Dictionary<char,Func<long>>());
-		}
+		}*/
 
 		public XElement exportToXml(int left, int current, int right) {
 			XElement result = new XElement("pageOuter",
diff --git a/IISMainHandler/handlers/BoardHandler.cs b/IISMainHandler/handlers/BoardHandler.cs
index 6805743..0946b2b 100644
--- a/IISMainHandler/handlers/BoardHandler.cs
+++ b/IISMainHandler/handlers/BoardHandler.cs
@@ -20,7 +20,7 @@ namespace FLocal.IISHandler.handlers {
 
 		override protected XElement[] getSpecificData(WebContext context) {
 			Board board = Board.LoadById(int.Parse(context.requestParts[1]));
-			PageOuter pageOuter = PageOuter.createFromGet(context.requestParts, context.userSettings.threadsPerPage);
+			PageOuter pageOuter = PageOuter.createFromGet(context.requestParts, context.userSettings.threadsPerPage, 2);
 			IEnumerable<Thread> threads = board.getThreads(pageOuter, context);
 			return new XElement[] {
 				new XElement("currentLocation", board.exportToXmlSimpleWithParent(context)),
diff --git a/IISMainHandler/handlers/ThreadHandler.cs b/IISMainHandler/handlers/ThreadHandler.cs
index 9c256de..adbecd5 100644
--- a/IISMainHandler/handlers/ThreadHandler.cs
+++ b/IISMainHandler/handlers/ThreadHandler.cs
@@ -48,7 +48,8 @@ namespace FLocal.IISHandler.handlers {
 							new JoinSpec[0]
 						)
 					}
-				}
+				},
+				2
 			);
 			IEnumerable<Post> posts = thread.getPosts(pageOuter, context);
 			thread.incrementViewsCounter();
diff --git a/IISMainHandler/handlers/response/BoardAsThread.cs b/IISMainHandler/handlers/response/BoardAsThread.cs
index c7fb52b..fe29cf4 100644
--- a/IISMainHandler/handlers/response/BoardAsThread.cs
+++ b/IISMainHandler/handlers/response/BoardAsThread.cs
@@ -20,7 +20,7 @@ namespace FLocal.IISHandler.handlers.response {
 
 		override protected XElement[] getSpecificData(WebContext context) {
 			Board board = Board.LoadById(int.Parse(context.requestParts[1]));
-			PageOuter pageOuter = PageOuter.createFromGet(context.requestParts, context.userSettings.postsPerPage);
+			PageOuter pageOuter = PageOuter.createFromGet(context.requestParts, context.userSettings.postsPerPage, 2);
 			IEnumerable<Thread> threads = board.getThreads(
 				pageOuter,
 				context, new SortSpec[] {
diff --git a/IISMainHandler/handlers/response/UserListHandler.cs b/IISMainHandler/handlers/response/UserListHandler.cs
index c4419b4..0e75003 100644
--- a/IISMainHandler/handlers/response/UserListHandler.cs
+++ b/IISMainHandler/handlers/response/UserListHandler.cs
@@ -19,7 +19,7 @@ namespace FLocal.IISHandler.handlers.response {
 		}
 
 		override protected XElement[] getSpecificData(WebContext context) {
-			PageOuter pageOuter = PageOuter.createFromGet(context.requestParts, context.userSettings.usersPerPage);
+			PageOuter pageOuter = PageOuter.createFromGet(context.requestParts, context.userSettings.usersPerPage, 1);
 			IEnumerable<User> users = User.getUsers(pageOuter, context);
 			return new XElement[] {
 				new XElement("users", 
diff --git a/ImportConsole/ImportConsole.csproj b/ImportConsole/ImportConsole.csproj
index fe7ef5d..10fee14 100644
--- a/ImportConsole/ImportConsole.csproj
+++ b/ImportConsole/ImportConsole.csproj
@@ -31,6 +31,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="NConsoler, Version=1.0.0.0, Culture=neutral, PublicKeyToken=652faff55808657c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\ThirdParty\NConsoler\NConsoler.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Core">
diff --git a/ImportConsole/Program.cs b/ImportConsole/Program.cs
index 2c299e8..e86c10d 100644
--- a/ImportConsole/Program.cs
+++ b/ImportConsole/Program.cs
@@ -7,10 +7,11 @@ using FLocal.Common.actions;
 using FLocal.Common.dataobjects;
 using FLocal.Core;
 using System.Configuration;
+using NConsoler;
 
 namespace FLocal.ImportConsole {
 	class Program {
-		static void Main(string[] args) {
+		public static void Main(string[] args) {
 
 			if(!FLocal.Common.Config.isInitialized) {
 				lock(typeof(FLocal.Common.Config)) {
@@ -18,39 +19,54 @@ namespace FLocal.ImportConsole {
 						FLocal.Common.Config.Init(ConfigurationManager.AppSettings);
 					}
 				}
+				Consolery.Run(typeof(Program), args);
 			}
+		}
+
+		[Action]
+		public static void ImportUsers() {
 
 			for(int i=1; i<800; i++) {
 				Console.Write("[" + i + "]");
 				foreach(string userName in ShallerGateway.getUserNames(i)) {
-					Console.Write(".");
-					Dictionary<string, string> userData = ShallerGateway.getUserInfo(userName);
-					AbstractChange addUser = new InsertChange(
-						User.TableSpec.instance,
-						new Dictionary<string, AbstractFieldValue>() {
-							{ User.TableSpec.FIELD_NAME, new ScalarFieldValue(userName) },
-							{ User.TableSpec.FIELD_REGDATE, new ScalarFieldValue(DateTime.Parse(userData["regDate"]).ToUTCString()) },
-							{ User.TableSpec.FIELD_LOCATION, new ScalarFieldValue(userData["location"]) },
-							{ User.TableSpec.FIELD_SHOWPOSTSTOUSERS, new ScalarFieldValue("All") },
-							{ User.TableSpec.FIELD_SIGNATURE, new ScalarFieldValue(userData["signature"]) },
-							{ User.TableSpec.FIELD_TITLE, new ScalarFieldValue(userData["title"]) },
-							{ User.TableSpec.FIELD_TOTALPOSTS, new ScalarFieldValue("0") },
-							{ User.TableSpec.FIELD_USERGROUPID, new ScalarFieldValue("1") },
-							{ User.TableSpec.FIELD_BIOGRAPHY, new ScalarFieldValue(userData["biography"]) },
-						}
-					);
-					AbstractChange addAccount = new InsertChange(
-						Account.TableSpec.instance,
-						new Dictionary<string,AbstractFieldValue>() {
-							{ Account.TableSpec.FIELD_NAME, new ScalarFieldValue(userName.ToLower()) },
-							{ Account.TableSpec.FIELD_NEEDSMIGRATION, new ScalarFieldValue("1") },
-							{ Account.TableSpec.FIELD_PASSWORDHASH, new ScalarFieldValue("*") },
-							{ Account.TableSpec.FIELD_USERID, new ReferenceFieldValue(addUser) },
-						}
-					);
-					ChangeSetUtil.ApplyChanges(addUser, addAccount);
+					try {
+						User.LoadByName(userName);
+						Console.Write("-");
+					} catch(NotFoundInDBException) {
+						Dictionary<string, string> userData = ShallerGateway.getUserInfo(userName);
+						AbstractChange addUser = new InsertChange(
+							User.TableSpec.instance,
+							new Dictionary<string, AbstractFieldValue>() {
+								{ User.TableSpec.FIELD_NAME, new ScalarFieldValue(userName) },
+								{ User.TableSpec.FIELD_REGDATE, new ScalarFieldValue(DateTime.Parse(userData["regDate"]).ToUTCString()) },
+								{ User.TableSpec.FIELD_LOCATION, new ScalarFieldValue(userData["location"]) },
+								{ User.TableSpec.FIELD_SHOWPOSTSTOUSERS, new ScalarFieldValue("All") },
+								{ User.TableSpec.FIELD_SIGNATURE, new ScalarFieldValue(userData["signature"]) },
+								{ User.TableSpec.FIELD_TITLE, new ScalarFieldValue(userData["title"]) },
+								{ User.TableSpec.FIELD_TOTALPOSTS, new ScalarFieldValue("0") },
+								{ User.TableSpec.FIELD_USERGROUPID, new ScalarFieldValue("1") },
+								{ User.TableSpec.FIELD_BIOGRAPHY, new ScalarFieldValue(userData["biography"]) },
+							}
+						);
+						AbstractChange addAccount = new InsertChange(
+							Account.TableSpec.instance,
+							new Dictionary<string,AbstractFieldValue>() {
+								{ Account.TableSpec.FIELD_NAME, new ScalarFieldValue(userName.ToLower()) },
+								{ Account.TableSpec.FIELD_NEEDSMIGRATION, new ScalarFieldValue("1") },
+								{ Account.TableSpec.FIELD_PASSWORDHASH, new ScalarFieldValue("*") },
+								{ Account.TableSpec.FIELD_USERID, new ReferenceFieldValue(addUser) },
+							}
+						);
+						ChangeSetUtil.ApplyChanges(addUser, addAccount);
+						Console.Write(".");
+					}
 				}
 			}
 		}
+
+		[Action]
+		public static void ProcessUpload(string pathToUpload) {
+			throw new NotImplementedException();
+		}
 	}
 }
diff --git a/ThirdParty/NConsoler/NConsoler.dll b/ThirdParty/NConsoler/NConsoler.dll
new file mode 100644
index 0000000000000000000000000000000000000000..d2c2b3dc92a7108d73d400a6ca4bef077889065a
GIT binary patch
literal 32768
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
Vrh%FUY8t3%pr(PE2L6Nw{x1znF^&KL

literal 0
HcmV?d00001

diff --git a/templates/Full/UserList.xslt b/templates/Full/UserList.xslt
index 1e456d6..f79d06c 100644
--- a/templates/Full/UserList.xslt
+++ b/templates/Full/UserList.xslt
@@ -51,7 +51,7 @@
 										<td>
 											<xsl:text>страницы:</xsl:text>
 											<xsl:apply-templates select="users/pageOuter" mode="withCurrent">
-												<xsl:with-param name="baseLink">/UserList/<xsl:value-of select="currentLocation/thread/id"/>/</xsl:with-param>
+												<xsl:with-param name="baseLink">/Users/</xsl:with-param>
 											</xsl:apply-templates>
 										</td>
 									</tr>