페이지 지정 예외 핸들링

rollrat · Apr 30, 2020 · 2262cf8 · 2262cf8
1 parent ec160ac
commit 2262cf8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/GalleryExplorer/CreateNew.xaml.cs b/GalleryExplorer/CreateNew.xaml.cs
@@ -75,24 +75,36 @@ private void GallerySelectText_TextChanged(object sender, TextChangedEventArgs e
             }
         }
 
-        public int PageStartsNum;
+        public int PageStartsNum = 1;
         private void PageStarts_TextChanged(object sender, TextChangedEventArgs e)
         {
             if (!int.TryParse(PageStarts.Text, out PageStartsNum))
             {
                 MessageBox.Show("숫자만 입력해 주세요!", "Gallery Explorer", MessageBoxButton.OK, MessageBoxImage.Error);
                 PageStarts.Text = "1";
             }
+
+            if (PageStartsNum > PageEndsNum)
+            {
+                MessageBox.Show("시작 페이지는 끝 페이지보다 작아야 합니다!", "Gallery Explorer", MessageBoxButton.OK, MessageBoxImage.Error);
+                PageStarts.Text = PageEndsNum.ToString();
+            }
         }
 
-        public int PageEndsNum;
+        public int PageEndsNum = 1;
         private void PageEnds_TextChanged(object sender, TextChangedEventArgs e)
         {
             if (!int.TryParse(PageEnds.Text, out PageEndsNum))
             {
                 MessageBox.Show("숫자만 입력해 주세요!", "Gallery Explorer", MessageBoxButton.OK, MessageBoxImage.Error);
                 PageEnds.Text = "1";
             }
+
+            if (PageStartsNum > PageEndsNum)
+            {
+                MessageBox.Show("끝 페이지는 시작 페이지보다 커야 합니다!", "Gallery Explorer", MessageBoxButton.OK, MessageBoxImage.Error);
+                PageEnds.Text = PageStartsNum.ToString();
+            }
         }
     }
 }
diff --git a/GalleryExplorer/CreateNewProgress.xaml.cs b/GalleryExplorer/CreateNewProgress.xaml.cs
@@ -36,12 +36,10 @@ public CreateNewProgress(string id, string name, int starts, int ends)
 
             Task.Run(() =>
             {
-                var page_end = ends;
-
                 var is_minor = DCGalleryList.Instance.MinorGalleryIds.Contains(id);
                 var articles = new List<DCInsidePageArticle>();
 
-                for (int i = starts; i <= ends; i++)
+                for (int i = starts, j = 1; i <= ends; i++, j++)
                 {
                     string url;
                     if (is_minor)
@@ -66,7 +64,7 @@ public CreateNewProgress(string id, string name, int starts, int ends)
 
                     articles.AddRange(gall.articles);
 
-                    Extends.Post(() => Message2.Text = $"작업 중...[{i}/{page_end - starts + 1} | {(100.0 * i / (page_end - starts + 1)).ToString("#0.00")}%]" );
+                    Extends.Post(() => Message2.Text = $"작업 중...[{j}/{ends - starts + 1} | {(100.0 * j / (ends - starts + 1)).ToString("#0.00")}%]" );
                 }
 
                 var overlap = new HashSet<string>();