From b358c6fbccf6893d552f0732ee1e718cebd87bae Mon Sep 17 00:00:00 2001 From: leiurayer <1432593898@qq.com> Date: Mon, 28 Feb 2022 21:48:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=A2=91=E9=81=93=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=9B=E5=AE=8C=E6=88=90=E6=88=91=E7=9A=84=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E5=A4=B9=E9=A1=B5=E9=9D=A2=EF=BC=9B=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BiliApi/BiliUtils/ParseEntrance.cs | 34 +- .../BiliApi/Favorites/Models/FavoritesList.cs | 4 +- src/DownKyi/App.xaml.cs | 5 +- src/DownKyi/DownKyi.csproj | 17 + src/DownKyi/FFmpeg_LICENSE.txt | 829 ++++-------------- src/DownKyi/Languages/Default.xaml | 7 + src/DownKyi/Services/FavoritesService.cs | 115 ++- src/DownKyi/Services/IFavoritesService.cs | 9 +- src/DownKyi/Services/SearchService.cs | 2 +- .../ViewModels/PageViewModels/ChannelMedia.cs | 82 ++ .../PageViewModels/FavoritesMedia.cs | 14 + .../PageViewModels/PublicationMedia.cs | 17 +- .../ViewModels/PageViewModels/VideoPage.cs | 3 +- .../UserSpace/ViewChannelViewModel.cs | 49 ++ .../ViewModels/ViewChannelViewModel.cs | 430 +++++++++ .../ViewModels/ViewMyFavoritesViewModel.cs | 472 ++++++++++ .../ViewModels/ViewMySpaceViewModel.cs | 2 +- .../ViewPublicFavoritesViewModel.cs | 90 +- .../ViewModels/ViewPublicationViewModel.cs | 24 +- .../ViewModels/ViewUserSpaceViewModel.cs | 2 +- src/DownKyi/Views/Settings/ViewAbout.xaml | 2 +- src/DownKyi/Views/UserSpace/ViewChannel.xaml | 12 +- src/DownKyi/Views/ViewChannel.xaml | 310 +++++++ src/DownKyi/Views/ViewChannel.xaml.cs | 28 + src/DownKyi/Views/ViewMyFavorites.xaml | 373 ++++++++ src/DownKyi/Views/ViewMyFavorites.xaml.cs | 28 + src/DownKyi/Views/ViewPublicFavorites.xaml | 31 + src/DownKyi/Views/ViewPublication.xaml | 12 +- src/README.md | 2 +- 29 files changed, 2293 insertions(+), 712 deletions(-) create mode 100644 src/DownKyi/ViewModels/PageViewModels/ChannelMedia.cs create mode 100644 src/DownKyi/ViewModels/ViewChannelViewModel.cs create mode 100644 src/DownKyi/ViewModels/ViewMyFavoritesViewModel.cs create mode 100644 src/DownKyi/Views/ViewChannel.xaml create mode 100644 src/DownKyi/Views/ViewChannel.xaml.cs create mode 100644 src/DownKyi/Views/ViewMyFavorites.xaml create mode 100644 src/DownKyi/Views/ViewMyFavorites.xaml.cs diff --git a/src/DownKyi.Core/BiliApi/BiliUtils/ParseEntrance.cs b/src/DownKyi.Core/BiliApi/BiliUtils/ParseEntrance.cs index 4b359c8..e4112e4 100644 --- a/src/DownKyi.Core/BiliApi/BiliUtils/ParseEntrance.cs +++ b/src/DownKyi.Core/BiliApi/BiliUtils/ParseEntrance.cs @@ -29,7 +29,8 @@ namespace DownKyi.Core.BiliApi.BiliUtils public static readonly string BangumiUrl = $"{WwwUrl}/bangumi/play/"; public static readonly string BangumiMediaUrl = $"{WwwUrl}/bangumi/media/"; public static readonly string CheeseUrl = $"{WwwUrl}/cheese/play/"; - public static readonly string FavoritesUrl = $"{WwwUrl}/medialist/detail/"; + public static readonly string FavoritesUrl1 = $"{WwwUrl}/medialist/detail/"; + public static readonly string FavoritesUrl2 = $"{WwwUrl}/medialist/play/"; #region 视频 @@ -314,10 +315,31 @@ namespace DownKyi.Core.BiliApi.BiliUtils /// public static bool IsFavoritesUrl(string input) { - string favoritesId = GetId(input, FavoritesUrl); + return IsFavoritesUrl1(input) || IsFavoritesUrl2(input); + } + + /// + /// 是否为收藏夹url1 + /// + /// + /// + private static bool IsFavoritesUrl1(string input) + { + string favoritesId = GetId(input, FavoritesUrl1); return IsFavoritesId(favoritesId); } + /// + /// 是否为收藏夹ur2 + /// + /// + /// + private static bool IsFavoritesUrl2(string input) + { + string favoritesId = GetId(input, FavoritesUrl2); + return IsFavoritesId(favoritesId.Split('/')[0]); + } + /// /// 获取收藏夹id /// @@ -329,9 +351,13 @@ namespace DownKyi.Core.BiliApi.BiliUtils { return Number.GetInt(input.Remove(0, 2)); } - else if (IsFavoritesUrl(input)) + else if (IsFavoritesUrl1(input)) + { + return Number.GetInt(GetId(input, FavoritesUrl1).Remove(0, 2)); + } + else if (IsFavoritesUrl2(input)) { - return Number.GetInt(GetId(input, FavoritesUrl).Remove(0, 2)); + return Number.GetInt(GetId(input, FavoritesUrl2).Remove(0, 2).Split('/')[0]); } else { diff --git a/src/DownKyi.Core/BiliApi/Favorites/Models/FavoritesList.cs b/src/DownKyi.Core/BiliApi/Favorites/Models/FavoritesList.cs index bd412a7..9face79 100644 --- a/src/DownKyi.Core/BiliApi/Favorites/Models/FavoritesList.cs +++ b/src/DownKyi.Core/BiliApi/Favorites/Models/FavoritesList.cs @@ -23,8 +23,8 @@ namespace DownKyi.Core.BiliApi.Favorites.Models public int Count { get; set; } [JsonProperty("list")] public List List { get; set; } - [JsonProperty("has_more")] - public int HasMore { get; set; } + //[JsonProperty("has_more")] + //public bool HasMore { get; set; } } } diff --git a/src/DownKyi/App.xaml.cs b/src/DownKyi/App.xaml.cs index 1a7b79c..1de062f 100644 --- a/src/DownKyi/App.xaml.cs +++ b/src/DownKyi/App.xaml.cs @@ -165,6 +165,9 @@ namespace DownKyi containerRegistry.RegisterForNavigation(ViewMySpaceViewModel.Tag); containerRegistry.RegisterForNavigation(ViewPublicFavoritesViewModel.Tag); containerRegistry.RegisterForNavigation(ViewPublicationViewModel.Tag); + containerRegistry.RegisterForNavigation(ViewModels.ViewChannelViewModel.Tag); + + containerRegistry.RegisterForNavigation(ViewMyFavoritesViewModel.Tag); // downloadManager pages containerRegistry.RegisterForNavigation(ViewDownloadingViewModel.Tag); @@ -184,7 +187,7 @@ namespace DownKyi // UserSpace containerRegistry.RegisterForNavigation(ViewArchiveViewModel.Tag); - containerRegistry.RegisterForNavigation(ViewChannelViewModel.Tag); + containerRegistry.RegisterForNavigation(ViewModels.UserSpace.ViewChannelViewModel.Tag); // dialogs containerRegistry.RegisterDialog(ViewDownloadSetterViewModel.Tag); diff --git a/src/DownKyi/DownKyi.csproj b/src/DownKyi/DownKyi.csproj index de0a921..10b62ac 100644 --- a/src/DownKyi/DownKyi.csproj +++ b/src/DownKyi/DownKyi.csproj @@ -102,6 +102,7 @@ + @@ -144,12 +145,14 @@ + + @@ -203,6 +206,9 @@ ViewChannel.xaml + + ViewChannel.xaml + ViewDownloadManager.xaml @@ -212,6 +218,9 @@ ViewLogin.xaml + + ViewMyFavorites.xaml + ViewMySpace.xaml @@ -377,6 +386,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -389,6 +402,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/src/DownKyi/FFmpeg_LICENSE.txt b/src/DownKyi/FFmpeg_LICENSE.txt index f288702..65c5ca8 100644 --- a/src/DownKyi/FFmpeg_LICENSE.txt +++ b/src/DownKyi/FFmpeg_LICENSE.txt @@ -1,674 +1,165 @@ - GNU GENERAL PUBLIC LICENSE + GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/src/DownKyi/Languages/Default.xaml b/src/DownKyi/Languages/Default.xaml index ddbc76c..d97fdc1 100644 --- a/src/DownKyi/Languages/Default.xaml +++ b/src/DownKyi/Languages/Default.xaml @@ -69,6 +69,13 @@ 收藏夹 个内容 + + 播放： + 收藏： + UP主： + 投稿： + 收藏于： + 下载选中项 下载全部 diff --git a/src/DownKyi/Services/FavoritesService.cs b/src/DownKyi/Services/FavoritesService.cs index 958dfd7..4c7f4f2 100644 --- a/src/DownKyi/Services/FavoritesService.cs +++ b/src/DownKyi/Services/FavoritesService.cs @@ -4,6 +4,7 @@ using DownKyi.Core.Utils; using DownKyi.ViewModels.PageViewModels; using Prism.Events; using System; +using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Threading; @@ -80,16 +81,44 @@ namespace DownKyi.Services return favorites; } + ///// + ///// 获取收藏夹所有内容明细列表 + ///// + ///// + ///// + ///// + //public void GetFavoritesMediaList(long mediaId, ObservableCollection result, IEventAggregator eventAggregator, CancellationToken cancellationToken) + //{ + // List medias = FavoritesResource.GetAllFavoritesMedia(mediaId); + // if (medias.Count == 0) { return; } + + // GetFavoritesMediaList(medias, result, eventAggregator, cancellationToken); + //} + + ///// + ///// 获取收藏夹指定页的内容明细列表 + ///// + ///// + ///// + ///// + ///// + ///// + //public void GetFavoritesMediaList(long mediaId, int pn, int ps, ObservableCollection result, IEventAggregator eventAggregator, CancellationToken cancellationToken) + //{ + // List medias = FavoritesResource.GetFavoritesMedia(mediaId, pn, ps); + // if (medias.Count == 0) { return; } + + // GetFavoritesMediaList(medias, result, eventAggregator, cancellationToken); + //} + /// /// 获取收藏夹内容明细列表 /// - /// - /// - public void GetFavoritesMediaList(long mediaId, ObservableCollection result, IEventAggregator eventAggregator) + /// + /// + /// + public void GetFavoritesMediaList(List medias, ObservableCollection result, IEventAggregator eventAggregator, CancellationToken cancellationToken) { - var medias = FavoritesResource.GetAllFavoritesMedia(mediaId); - if (medias.Count == 0) { return; } - int order = 0; foreach (var media in medias) { @@ -102,6 +131,17 @@ namespace DownKyi.Services string coverUrl = media.Cover; BitmapImage cover = storageCover.GetCoverThumbnail(media.Id, media.Bvid, -1, coverUrl, 200, 125); + // 当地时区 + DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)); + + // 创建时间 + DateTime dateCTime = startTime.AddSeconds(media.Ctime); + string ctime = dateCTime.ToString("yyyy-MM-dd"); + + // 收藏时间 + DateTime dateFavTime = startTime.AddSeconds(media.FavTime); + string favTime = dateFavTime.ToString("yyyy-MM-dd"); + App.PropertyChangeAsync(new Action(() => { FavoritesMedia newMedia = new FavoritesMedia(eventAggregator) @@ -116,7 +156,9 @@ namespace DownKyi.Services FavoriteNumber = media.CntInfo != null ? Format.FormatNumber(media.CntInfo.Collect) : "0", Duration = Format.FormatDuration2(media.Duration), UpName = media.Upper != null ? media.Upper.Name : string.Empty, - UpperMid = media.Upper != null ? media.Upper.Mid : -1 + UpperMid = media.Upper != null ? media.Upper.Mid : -1, + CreateTime = ctime, + FavTime = favTime }; if (!result.ToList().Exists(t => t.Avid == newMedia.Avid)) @@ -125,7 +167,66 @@ namespace DownKyi.Services Thread.Sleep(10); } })); + + // 判断是否该结束线程，若为true，跳出循环 + if (cancellationToken.IsCancellationRequested) + { + break; + } + } + } + + /// + /// 更新我创建的收藏夹列表 + /// + /// + /// + public void GetCreatedFavorites(long mid, ObservableCollection tabHeaders, CancellationToken cancellationToken) + { + var favorites = FavoritesInfo.GetAllCreatedFavorites(mid); + if (favorites.Count == 0) { return; } + + foreach (var item in favorites) + { + //cancellationToken.ThrowIfCancellationRequested(); + + // 判断是否该结束线程，若为true，跳出循环 + if (cancellationToken.IsCancellationRequested) + { + break; + } + + App.PropertyChangeAsync(new Action(() => + { + tabHeaders.Add(new TabHeader { Id = (int)item.Id, Title = item.Title, SubTitle = item.MediaCount.ToString() }); + })); + } + } + + /// + /// 更新我收藏的收藏夹列表 + /// + /// + /// + public void GetCollectedFavorites(long mid, ObservableCollection tabHeaders, CancellationToken cancellationToken) + { + var favorites = FavoritesInfo.GetAllCollectedFavorites(mid); + if (favorites.Count == 0) { return; } + + foreach (var item in favorites) + { + // 判断是否该结束线程，若为true，跳出循环 + if (cancellationToken.IsCancellationRequested) + { + break; + } + + App.PropertyChangeAsync(new Action(() => + { + tabHeaders.Add(new TabHeader { Id = (int)item.Id, Title = item.Title, SubTitle = item.MediaCount.ToString() }); + })); } } + } } diff --git a/src/DownKyi/Services/IFavoritesService.cs b/src/DownKyi/Services/IFavoritesService.cs index f83e761..9770e92 100644 --- a/src/DownKyi/Services/IFavoritesService.cs +++ b/src/DownKyi/Services/IFavoritesService.cs @@ -1,12 +1,19 @@ using DownKyi.ViewModels.PageViewModels; using Prism.Events; +using System.Collections.Generic; using System.Collections.ObjectModel; +using System.Threading; namespace DownKyi.Services { public interface IFavoritesService { Favorites GetFavorites(long mediaId); - void GetFavoritesMediaList(long mediaId, ObservableCollection result, IEventAggregator eventAggregator); + //void GetFavoritesMediaList(long mediaId, ObservableCollection result, IEventAggregator eventAggregator, CancellationToken cancellationToken); + //void GetFavoritesMediaList(long mediaId, int pn, int ps, ObservableCollection result, IEventAggregator eventAggregator, CancellationToken cancellationToken); + void GetFavoritesMediaList(List medias, ObservableCollection result, IEventAggregator eventAggregator, CancellationToken cancellationToken); + + void GetCreatedFavorites(long mid, ObservableCollection tabHeaders, CancellationToken cancellationToken); + void GetCollectedFavorites(long mid, ObservableCollection tabHeaders, CancellationToken cancellationToken); } } diff --git a/src/DownKyi/Services/SearchService.cs b/src/DownKyi/Services/SearchService.cs index 8ead7bd..d1badbc 100644 --- a/src/DownKyi/Services/SearchService.cs +++ b/src/DownKyi/Services/SearchService.cs @@ -17,7 +17,7 @@ namespace DownKyi.Services /// 番剧（电影、电视剧）md号：md28228367, MD28228367, https://www.bilibili.com/bangumi/media/md28228367 /// 课程ss号：https://www.bilibili.com/cheese/play/ss205 /// 课程ep号：https://www.bilibili.com/cheese/play/ep3489 - /// 收藏夹：ml1329019876, ML1329019876, https://www.bilibili.com/medialist/detail/ml1329019876 + /// 收藏夹：ml1329019876, ML1329019876, https://www.bilibili.com/medialist/detail/ml1329019876, https://www.bilibili.com/medialist/play/ml1329019876/ /// 用户空间：uid928123, UID928123, uid:928123, UID:928123, https://space.bilibili.com/928123 /// /// diff --git a/src/DownKyi/ViewModels/PageViewModels/ChannelMedia.cs b/src/DownKyi/ViewModels/PageViewModels/ChannelMedia.cs new file mode 100644 index 0000000..6bcf0ea --- /dev/null +++ b/src/DownKyi/ViewModels/PageViewModels/ChannelMedia.cs @@ -0,0 +1,82 @@ +using DownKyi.Core.BiliApi.BiliUtils; +using DownKyi.Utils; +using Prism.Commands; +using Prism.Events; +using Prism.Mvvm; +using System.Windows.Media.Imaging; + +namespace DownKyi.ViewModels.PageViewModels +{ + public class ChannelMedia : BindableBase + { + protected readonly IEventAggregator eventAggregator; + + public ChannelMedia(IEventAggregator eventAggregator) + { + this.eventAggregator = eventAggregator; + } + + public long Avid { get; set; } + public string Bvid { get; set; } + + private bool isSelected; + public bool IsSelected + { + get => isSelected; + set => SetProperty(ref isSelected, value); + } + + private BitmapImage cover; + public BitmapImage Cover + { + get => cover; + set => SetProperty(ref cover, value); + } + + private string title; + public string Title + { + get => title; + set => SetProperty(ref title, value); + } + + private string duration; + public string Duration + { + get => duration; + set => SetProperty(ref duration, value); + } + + private string playNumber; + public string PlayNumber + { + get => playNumber; + set => SetProperty(ref playNumber, value); + } + + private string createTime; + public string CreateTime + { + get => createTime; + set => SetProperty(ref createTime, value); + } + + // 视频标题点击事件 + private DelegateCommand titleCommand; + public DelegateCommand TitleCommand => titleCommand ?? (titleCommand = new DelegateCommand(ExecuteTitleCommand)); + + /// + /// 视频标题点击事件 + /// + /// + private void ExecuteTitleCommand(object parameter) + { + if (!(parameter is string tag)) { return; } + + NavigateToView.NavigationView(eventAggregator, ViewVideoDetailViewModel.Tag, tag, $"{ParseEntrance.VideoUrl}{Bvid}"); + //string url = "https://www.bilibili.com/video/" + tag; + //System.Diagnostics.Process.Start(url); + } + + } +} diff --git a/src/DownKyi/ViewModels/PageViewModels/FavoritesMedia.cs b/src/DownKyi/ViewModels/PageViewModels/FavoritesMedia.cs index b9db2a5..ea8f972 100644 --- a/src/DownKyi/ViewModels/PageViewModels/FavoritesMedia.cs +++ b/src/DownKyi/ViewModels/PageViewModels/FavoritesMedia.cs @@ -85,6 +85,20 @@ namespace DownKyi.ViewModels.PageViewModels set => SetProperty(ref upName, value); } + private string createTime; + public string CreateTime + { + get => createTime; + set => SetProperty(ref createTime, value); + } + + private string favTime; + public string FavTime + { + get => favTime; + set => SetProperty(ref favTime, value); + } + #endregion #region 命令申明 diff --git a/src/DownKyi/ViewModels/PageViewModels/PublicationMedia.cs b/src/DownKyi/ViewModels/PageViewModels/PublicationMedia.cs index f7c2636..6d78abb 100644 --- a/src/DownKyi/ViewModels/PageViewModels/PublicationMedia.cs +++ b/src/DownKyi/ViewModels/PageViewModels/PublicationMedia.cs @@ -1,4 +1,7 @@ -using Prism.Commands; +using DownKyi.Core.BiliApi.BiliUtils; +using DownKyi.Utils; +using Prism.Commands; +using Prism.Events; using Prism.Mvvm; using System.Windows.Media.Imaging; @@ -6,6 +9,13 @@ namespace DownKyi.ViewModels.PageViewModels { public class PublicationMedia : BindableBase { + protected readonly IEventAggregator eventAggregator; + + public PublicationMedia(IEventAggregator eventAggregator) + { + this.eventAggregator = eventAggregator; + } + public long Avid { get; set; } public string Bvid { get; set; } @@ -63,8 +73,9 @@ namespace DownKyi.ViewModels.PageViewModels { if (!(parameter is string tag)) { return; } - string url = "https://www.bilibili.com/video/" + tag; - System.Diagnostics.Process.Start(url); + NavigateToView.NavigationView(eventAggregator, ViewVideoDetailViewModel.Tag, tag, $"{ParseEntrance.VideoUrl}{Bvid}"); + //string url = "https://www.bilibili.com/video/" + tag; + //System.Diagnostics.Process.Start(url); } } diff --git a/src/DownKyi/ViewModels/PageViewModels/VideoPage.cs b/src/DownKyi/ViewModels/PageViewModels/VideoPage.cs index 08b9373..be645a9 100644 --- a/src/DownKyi/ViewModels/PageViewModels/VideoPage.cs +++ b/src/DownKyi/ViewModels/PageViewModels/VideoPage.cs @@ -75,7 +75,6 @@ namespace DownKyi.ViewModels.PageViewModels set => SetProperty(ref videoQuality, value); } - #region // 视频画质选择事件 @@ -89,7 +88,7 @@ namespace DownKyi.ViewModels.PageViewModels { // 杜比视界 string dolby = Constant.GetAudioQualities()[3].Name; - if (VideoQuality.Quality == 126) + if (VideoQuality != null && VideoQuality.Quality == 126) { ListHelper.AddUnique(AudioQualityFormatList, dolby); AudioQualityFormat = dolby; diff --git a/src/DownKyi/ViewModels/UserSpace/ViewChannelViewModel.cs b/src/DownKyi/ViewModels/UserSpace/ViewChannelViewModel.cs index f6f38c2..c5776bb 100644 --- a/src/DownKyi/ViewModels/UserSpace/ViewChannelViewModel.cs +++ b/src/DownKyi/ViewModels/UserSpace/ViewChannelViewModel.cs @@ -1,5 +1,7 @@ using DownKyi.Core.BiliApi.Users.Models; using DownKyi.Core.Storage; +using DownKyi.Events; +using Prism.Commands; using Prism.Events; using Prism.Regions; using System; @@ -14,6 +16,8 @@ namespace DownKyi.ViewModels.UserSpace { public const string Tag = "PageUserSpaceChannel"; + private long mid = -1; + #region 页面属性申明 private ObservableCollection channels; @@ -23,6 +27,13 @@ namespace DownKyi.ViewModels.UserSpace set => SetProperty(ref channels, value); } + private int selectedItem; + public int SelectedItem + { + get => selectedItem; + set => SetProperty(ref selectedItem, value); + } + #endregion public ViewChannelViewModel(IEventAggregator eventAggregator) : base(eventAggregator) @@ -35,6 +46,39 @@ namespace DownKyi.ViewModels.UserSpace } #region 命令申明 + + // 视频选择事件 + private DelegateCommand channelsCommand; + public DelegateCommand ChannelsCommand => channelsCommand ?? (channelsCommand = new DelegateCommand(ExecuteChannelsCommand)); + + /// + /// 视频选择事件 + /// + /// + private void ExecuteChannelsCommand(object parameter) + { + if (!(parameter is Channel channel)) { return; } + + Dictionary data = new Dictionary + { + { "mid", mid }, + { "cid", channel.Cid }, + { "name", channel.Name }, + { "count", channel.Count } + }; + + // 进入视频页面 + NavigationParam param = new NavigationParam + { + ViewName = ViewModels.ViewChannelViewModel.Tag, + ParentViewName = ViewUserSpaceViewModel.Tag, + Parameter = data + }; + eventAggregator.GetEvent().Publish(param); + + SelectedItem = -1; + } + #endregion public override void OnNavigatedFrom(NavigationContext navigationContext) @@ -42,6 +86,7 @@ namespace DownKyi.ViewModels.UserSpace base.OnNavigatedFrom(navigationContext); Channels.Clear(); + SelectedItem = -1; } /// @@ -53,6 +98,7 @@ namespace DownKyi.ViewModels.UserSpace base.OnNavigatedTo(navigationContext); Channels.Clear(); + SelectedItem = -1; // 根据传入参数不同执行不同任务 var parameter = navigationContext.Parameters.GetValue>("object"); @@ -61,6 +107,9 @@ namespace DownKyi.ViewModels.UserSpace return; } + // 传入mid + mid = navigationContext.Parameters.GetValue("mid"); + foreach (var channel in parameter) { if (channel.Count <= 0) { continue; } diff --git a/src/DownKyi/ViewModels/ViewChannelViewModel.cs b/src/DownKyi/ViewModels/ViewChannelViewModel.cs new file mode 100644 index 0000000..bea825d --- /dev/null +++ b/src/DownKyi/ViewModels/ViewChannelViewModel.cs @@ -0,0 +1,430 @@ +using DownKyi.Core.BiliApi.VideoStream; +using DownKyi.Core.Storage; +using DownKyi.Core.Utils; +using DownKyi.CustomControl; +using DownKyi.Events; +using DownKyi.Images; +using DownKyi.Services; +using DownKyi.Services.Download; +using DownKyi.Utils; +using DownKyi.ViewModels.PageViewModels; +using Prism.Commands; +using Prism.Events; +using Prism.Regions; +using Prism.Services.Dialogs; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Threading; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Media.Imaging; + +namespace DownKyi.ViewModels +{ + public class ViewChannelViewModel : BaseViewModel + { + public const string Tag = "PageChannel"; + + private readonly IDialogService dialogService; + + private CancellationTokenSource tokenSource; + + private long mid = -1; + private long cid = -1; + + // 每页视频数量，暂时在此写死，以后在设置中增加选项 + private readonly int VideoNumberInPage = 30; + + #region 页面属性申明 + + private string pageName = Tag; + public string PageName + { + get => pageName; + set => SetProperty(ref pageName, value); + } + + private GifImage loading; + public GifImage Loading + { + get => loading; + set => SetProperty(ref loading, value); + } + + private Visibility loadingVisibility; + public Visibility LoadingVisibility + { + get => loadingVisibility; + set => SetProperty(ref loadingVisibility, value); + } + + private Visibility noDataVisibility; + public Visibility NoDataVisibility + { + get => noDataVisibility; + set => SetProperty(ref noDataVisibility, value); + } + + private VectorImage arrowBack; + public VectorImage ArrowBack + { + get => arrowBack; + set => SetProperty(ref arrowBack, value); + } + + private string title; + public string Title + { + get => title; + set => SetProperty(ref title, value); + } + + private bool isEnabled = true; + public bool IsEnabled + { + get => isEnabled; + set => SetProperty(ref isEnabled, value); + } + + private CustomPagerViewModel pager; + public CustomPagerViewModel Pager + { + get => pager; + set => SetProperty(ref pager, value); + } + + private ObservableCollection medias; + public ObservableCollection Medias + { + get => medias; + set => SetProperty(ref medias, value); + } + + private bool isSelectAll; + public bool IsSelectAll + { + get => isSelectAll; + set => SetProperty(ref isSelectAll, value); + } + + #endregion + + public ViewChannelViewModel(IEventAggregator eventAggregator, IDialogService dialogService) : base(eventAggregator) + { + this.dialogService = dialogService; + + #region 属性初始化 + + // 初始化loading gif + Loading = new GifImage(Properties.Resources.loading); + Loading.StartAnimate(); + LoadingVisibility = Visibility.Collapsed; + NoDataVisibility = Visibility.Collapsed; + + ArrowBack = NavigationIcon.Instance().ArrowBack; + ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark"); + + Medias = new ObservableCollection(); + + #endregion + } + + #region 命令申明 + + // 返回事件 + private DelegateCommand backSpaceCommand; + public DelegateCommand BackSpaceCommand => backSpaceCommand ?? (backSpaceCommand = new DelegateCommand(ExecuteBackSpace)); + + /// + /// 返回事件 + /// + private void ExecuteBackSpace() + { + ArrowBack.Fill = DictionaryResource.GetColor("ColorText"); + + // 结束任务 + tokenSource?.Cancel(); + + NavigationParam parameter = new NavigationParam + { + ViewName = ParentView, + ParentViewName = null, + Parameter = null + }; + eventAggregator.GetEvent().Publish(parameter); + } + + // 全选按钮点击事件 + private DelegateCommand selectAllCommand; + public DelegateCommand SelectAllCommand => selectAllCommand ?? (selectAllCommand = new DelegateCommand(ExecuteSelectAllCommand)); + + /// + /// 全选按钮点击事件 + /// + /// + private void ExecuteSelectAllCommand(object parameter) + { + if (IsSelectAll) + { + foreach (var item in Medias) + { + item.IsSelected = true; + } + } + else + { + foreach (var item in Medias) + { + item.IsSelected = false; + } + } + } + + // 列表选择事件 + private DelegateCommand mediasCommand; + public DelegateCommand MediasCommand => mediasCommand ?? (mediasCommand = new DelegateCommand(ExecuteMediasCommand)); + + /// + /// 列表选择事件 + /// + /// + private void ExecuteMediasCommand(object parameter) + { + if (!(parameter is IList selectedMedia)) { return; } + + if (selectedMedia.Count == Medias.Count) + { + IsSelectAll = true; + } + else + { + IsSelectAll = false; + } + } + + // 添加选中项到下载列表事件 + private DelegateCommand addToDownloadCommand; + public DelegateCommand AddToDownloadCommand => addToDownloadCommand ?? (addToDownloadCommand = new DelegateCommand(ExecuteAddToDownloadCommand)); + + /// + /// 添加选中项到下载列表事件 + /// + private void ExecuteAddToDownloadCommand() + { + AddToDownload(true); + } + + // 添加所有视频到下载列表事件 + private DelegateCommand addAllToDownloadCommand; + public DelegateCommand AddAllToDownloadCommand => addAllToDownloadCommand ?? (addAllToDownloadCommand = new DelegateCommand(ExecuteAddAllToDownloadCommand)); + + /// + /// 添加所有视频到下载列表事件 + /// + private void ExecuteAddAllToDownloadCommand() + { + AddToDownload(false); + } + + #endregion + + /// + /// 添加到下载 + /// + /// + private async void AddToDownload(bool isOnlySelected) + { + // 收藏夹里只有视频 + AddToDownloadService addToDownloadService = new AddToDownloadService(PlayStreamType.VIDEO); + + // 选择文件夹 + string directory = addToDownloadService.SetDirectory(dialogService); + + // 视频计数 + int i = 0; + await Task.Run(() => + { + // 添加到下载 + foreach (var media in Medias) + { + // 只下载选中项，跳过未选中项 + if (isOnlySelected && !media.IsSelected) { continue; } + + /// 有分P的就下载全部 + + // 开启服务 + VideoInfoService videoInfoService = new VideoInfoService(media.Bvid); + + addToDownloadService.SetVideoInfoService(videoInfoService); + addToDownloadService.GetVideo(); + addToDownloadService.ParseVideo(videoInfoService); + // 下载 + i += addToDownloadService.AddToDownload(eventAggregator, directory); + } + }); + + if (directory == null) + { + return; + } + + // 通知用户添加到下载列表的结果 + if (i == 0) + { + eventAggregator.GetEvent().Publish(DictionaryResource.GetString("TipAddDownloadingZero")); + } + else + { + eventAggregator.GetEvent().Publish($"{DictionaryResource.GetString("TipAddDownloadingFinished1")}{i}{DictionaryResource.GetString("TipAddDownloadingFinished2")}"); + } + } + + private void OnCountChanged_Pager(int count) { } + + private bool OnCurrentChanged_Pager(int old, int current) + { + if (!IsEnabled) + { + //Pager.Current = old; + return false; + } + + Medias.Clear(); + LoadingVisibility = Visibility.Visible; + NoDataVisibility = Visibility.Collapsed; + + UpdateChannel(current); + + return true; + } + + private async void UpdateChannel(int current) + { + // 是否正在获取数据 + // 在所有的退出分支中都需要设为true + IsEnabled = false; + + await Task.Run(() => + { + CancellationToken cancellationToken = tokenSource.Token; + + var channels = Core.BiliApi.Users.UserSpace.GetChannelVideoList(mid, cid, current, VideoNumberInPage); + if (channels == null || channels.Count == 0) + { + // 没有数据，UI提示 + LoadingVisibility = Visibility.Collapsed; + NoDataVisibility = Visibility.Visible; + return; + } + + foreach (var video in channels) + { + if (video.Cid == 0) + { + continue; + } + + // 查询、保存封面 + string coverUrl = video.Pic; + BitmapImage cover; + if (coverUrl == null || coverUrl == "") + { + cover = null; // new BitmapImage(new Uri($"pack://application:,,,/Resources/video-placeholder.png")); + } + else + { + if (!coverUrl.ToLower().StartsWith("http")) + { + coverUrl = $"https:{video.Pic}"; + } + + StorageCover storageCover = new StorageCover(); + cover = storageCover.GetCoverThumbnail(video.Aid, video.Bvid, -1, coverUrl, 200, 125); + } + + // 播放数 + string play = string.Empty; + if (video.Stat != null) + { + if (video.Stat.View > 0) + { + play = Format.FormatNumber(video.Stat.View); + } + else + { + play = "--"; + } + } + else + { + play = "--"; + } + + DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)); // 当地时区 + DateTime dateCTime = startTime.AddSeconds(video.Ctime); + string ctime = dateCTime.ToString("yyyy-MM-dd"); + + App.PropertyChangeAsync(new Action(() => + { + ChannelMedia media = new ChannelMedia(eventAggregator) + { + Avid = video.Aid, + Bvid = video.Bvid, + Cover = cover ?? new BitmapImage(new Uri($"pack://application:,,,/Resources/video-placeholder.png")), + Duration = Format.FormatDuration3(video.Duration), + Title = video.Title, + PlayNumber = play, + CreateTime = ctime + }; + Medias.Add(media); + + LoadingVisibility = Visibility.Collapsed; + NoDataVisibility = Visibility.Collapsed; + })); + + // 判断是否该结束线程，若为true，跳出循环 + if (cancellationToken.IsCancellationRequested) + { + break; + } + } + + }, (tokenSource = new CancellationTokenSource()).Token); + + IsEnabled = true; + } + + /// + /// 导航到VideoDetail页面时执行 + /// + /// + public override void OnNavigatedTo(NavigationContext navigationContext) + { + base.OnNavigatedTo(navigationContext); + + ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark"); + Medias.Clear(); + + // 根据传入参数不同执行不同任务 + var parameter = navigationContext.Parameters.GetValue>("Parameter"); + if (parameter == null) + { + return; + } + + mid = (long)parameter["mid"]; + cid = (long)parameter["cid"]; + Title = (string)parameter["name"]; + int count = (int)parameter["count"]; + + // 页面选择 + Pager = new CustomPagerViewModel(1, (int)Math.Ceiling((double)count / VideoNumberInPage)); + Pager.CurrentChanged += OnCurrentChanged_Pager; + Pager.CountChanged += OnCountChanged_Pager; + Pager.Current = 1; + } + + } +} diff --git a/src/DownKyi/ViewModels/ViewMyFavoritesViewModel.cs b/src/DownKyi/ViewModels/ViewMyFavoritesViewModel.cs new file mode 100644 index 0000000..8c2694a --- /dev/null +++ b/src/DownKyi/ViewModels/ViewMyFavoritesViewModel.cs @@ -0,0 +1,472 @@ +using DownKyi.Core.BiliApi.Favorites; +using DownKyi.Core.BiliApi.VideoStream; +using DownKyi.CustomControl; +using DownKyi.Events; +using DownKyi.Images; +using DownKyi.Services; +using DownKyi.Services.Download; +using DownKyi.Utils; +using DownKyi.ViewModels.PageViewModels; +using Prism.Commands; +using Prism.Events; +using Prism.Regions; +using Prism.Services.Dialogs; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Threading; +using System.Threading.Tasks; +using System.Windows; + +namespace DownKyi.ViewModels +{ + public class ViewMyFavoritesViewModel : BaseViewModel + { + public const string Tag = "PageMyFavorites"; + + private readonly IDialogService dialogService; + + private CancellationTokenSource tokenSource1; + private CancellationTokenSource tokenSource2; + + private long mid = -1; + + // 每页视频数量，暂时在此写死，以后在设置中增加选项 + private readonly int VideoNumberInPage = 20; + + #region 页面属性申明 + + private string pageName = Tag; + public string PageName + { + get => pageName; + set => SetProperty(ref pageName, value); + } + + private Visibility contentVisibility; + public Visibility ContentVisibility + { + get => contentVisibility; + set => SetProperty(ref contentVisibility, value); + } + + private GifImage loading; + public GifImage Loading + { + get => loading; + set => SetProperty(ref loading, value); + } + + private Visibility loadingVisibility; + public Visibility LoadingVisibility + { + get => loadingVisibility; + set => SetProperty(ref loadingVisibility, value); + } + + private Visibility noDataVisibility; + public Visibility NoDataVisibility + { + get => noDataVisibility; + set => SetProperty(ref noDataVisibility, value); + } + + private GifImage mediaLoading; + public GifImage MediaLoading + { + get => mediaLoading; + set => SetProperty(ref mediaLoading, value); + } + + private Visibility mediaLoadingVisibility; + public Visibility MediaLoadingVisibility + { + get => mediaLoadingVisibility; + set => SetProperty(ref mediaLoadingVisibility, value); + } + + private Visibility mediaNoDataVisibility; + public Visibility MediaNoDataVisibility + { + get => mediaNoDataVisibility; + set => SetProperty(ref mediaNoDataVisibility, value); + } + + private VectorImage arrowBack; + public VectorImage ArrowBack + { + get => arrowBack; + set => SetProperty(ref arrowBack, value); + } + + private ObservableCollection tabHeaders; + public ObservableCollection TabHeaders + { + get => tabHeaders; + set => SetProperty(ref tabHeaders, value); + } + + private int selectTabId; + public int SelectTabId + { + get => selectTabId; + set => SetProperty(ref selectTabId, value); + } + + private bool isEnabled = true; + public bool IsEnabled + { + get => isEnabled; + set => SetProperty(ref isEnabled, value); + } + + private CustomPagerViewModel pager; + public CustomPagerViewModel Pager + { + get => pager; + set => SetProperty(ref pager, value); + } + + private ObservableCollection medias; + public ObservableCollection Medias + { + get => medias; + set => SetProperty(ref medias, value); + } + + private bool isSelectAll; + public bool IsSelectAll + { + get => isSelectAll; + set => SetProperty(ref isSelectAll, value); + } + + #endregion + + public ViewMyFavoritesViewModel(IEventAggregator eventAggregator, IDialogService dialogService) : base(eventAggregator) + { + this.dialogService = dialogService; + + #region 属性初始化 + + // 初始化loading gif + Loading = new GifImage(Properties.Resources.loading); + Loading.StartAnimate(); + LoadingVisibility = Visibility.Collapsed; + NoDataVisibility = Visibility.Collapsed; + + MediaLoading = new GifImage(Properties.Resources.loading); + MediaLoading.StartAnimate(); + MediaLoadingVisibility = Visibility.Collapsed; + MediaNoDataVisibility = Visibility.Collapsed; + + ArrowBack = NavigationIcon.Instance().ArrowBack; + ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark"); + + TabHeaders = new ObservableCollection(); + Medias = new ObservableCollection(); + + #endregion + } + + #region 命令申明 + + // 返回事件 + private DelegateCommand backSpaceCommand; + public DelegateCommand BackSpaceCommand => backSpaceCommand ?? (backSpaceCommand = new DelegateCommand(ExecuteBackSpace)); + + /// + /// 返回事件 + /// + private void ExecuteBackSpace() + { + InitView(); + + ArrowBack.Fill = DictionaryResource.GetColor("ColorText"); + + // 结束任务 + tokenSource1?.Cancel(); + tokenSource2?.Cancel(); + + NavigationParam parameter = new NavigationParam + { + ViewName = ParentView, + ParentViewName = null, + Parameter = null + }; + eventAggregator.GetEvent().Publish(parameter); + } + + // 左侧tab点击事件 + private DelegateCommand leftTabHeadersCommand; + public DelegateCommand LeftTabHeadersCommand => leftTabHeadersCommand ?? (leftTabHeadersCommand = new DelegateCommand(ExecuteLeftTabHeadersCommand, CanExecuteLeftTabHeadersCommand)); + + /// + /// 左侧tab点击事件 + /// + /// + private void ExecuteLeftTabHeadersCommand(object parameter) + { + if (!(parameter is TabHeader tabHeader)) { return; } + + // 页面选择 + Pager = new CustomPagerViewModel(1, (int)Math.Ceiling(double.Parse(tabHeader.SubTitle) / VideoNumberInPage)); + Pager.CurrentChanged += OnCurrentChanged_Pager; + Pager.CountChanged += OnCountChanged_Pager; + Pager.Current = 1; + } + + /// + /// 左侧tab点击事件是否允许执行 + /// + /// + /// + private bool CanExecuteLeftTabHeadersCommand(object parameter) + { + return IsEnabled; + } + + // 全选按钮点击事件 + private DelegateCommand selectAllCommand; + public DelegateCommand SelectAllCommand => selectAllCommand ?? (selectAllCommand = new DelegateCommand(ExecuteSelectAllCommand)); + + /// + /// 全选按钮点击事件 + /// + /// + private void ExecuteSelectAllCommand(object parameter) + { + if (IsSelectAll) + { + foreach (var item in Medias) + { + item.IsSelected = true; + } + } + else + { + foreach (var item in Medias) + { + item.IsSelected = false; + } + } + } + + // 列表选择事件 + private DelegateCommand mediasCommand; + public DelegateCommand MediasCommand => mediasCommand ?? (mediasCommand = new DelegateCommand(ExecuteMediasCommand)); + + /// + /// 列表选择事件 + /// + /// + private void ExecuteMediasCommand(object parameter) + { + if (!(parameter is IList selectedMedia)) { return; } + + if (selectedMedia.Count == Medias.Count) + { + IsSelectAll = true; + } + else + { + IsSelectAll = false; + } + } + + // 添加选中项到下载列表事件 + private DelegateCommand addToDownloadCommand; + public DelegateCommand AddToDownloadCommand => addToDownloadCommand ?? (addToDownloadCommand = new DelegateCommand(ExecuteAddToDownloadCommand)); + + /// + /// 添加选中项到下载列表事件 + /// + private void ExecuteAddToDownloadCommand() + { + AddToDownload(true); + } + + // 添加所有视频到下载列表事件 + private DelegateCommand addAllToDownloadCommand; + public DelegateCommand AddAllToDownloadCommand => addAllToDownloadCommand ?? (addAllToDownloadCommand = new DelegateCommand(ExecuteAddAllToDownloadCommand)); + + /// + /// 添加所有视频到下载列表事件 + /// + private void ExecuteAddAllToDownloadCommand() + { + AddToDownload(false); + } + + #endregion + + /// + /// 添加到下载 + /// + /// + private async void AddToDownload(bool isOnlySelected) + { + // 收藏夹里只有视频 + AddToDownloadService addToDownloadService = new AddToDownloadService(PlayStreamType.VIDEO); + + // 选择文件夹 + string directory = addToDownloadService.SetDirectory(dialogService); + + // 视频计数 + int i = 0; + await Task.Run(() => + { + // 添加到下载 + foreach (var media in Medias) + { + // 只下载选中项，跳过未选中项 + if (isOnlySelected && !media.IsSelected) { continue; } + + /// 有分P的就下载全部 + + // 开启服务 + VideoInfoService videoInfoService = new VideoInfoService(media.Bvid); + + addToDownloadService.SetVideoInfoService(videoInfoService); + addToDownloadService.GetVideo(); + addToDownloadService.ParseVideo(videoInfoService); + // 下载 + i += addToDownloadService.AddToDownload(eventAggregator, directory); + } + }); + + if (directory == null) + { + return; + } + + // 通知用户添加到下载列表的结果 + if (i == 0) + { + eventAggregator.GetEvent().Publish(DictionaryResource.GetString("TipAddDownloadingZero")); + } + else + { + eventAggregator.GetEvent().Publish($"{DictionaryResource.GetString("TipAddDownloadingFinished1")}{i}{DictionaryResource.GetString("TipAddDownloadingFinished2")}"); + } + } + + private void OnCountChanged_Pager(int count) { } + + private bool OnCurrentChanged_Pager(int old, int current) + { + if (!IsEnabled) + { + //Pager.Current = old; + return false; + } + + UpdateFavoritesMediaList(current); + + return true; + } + + private async void UpdateFavoritesMediaList(int current) + { + Medias.Clear(); + MediaLoadingVisibility = Visibility.Visible; + MediaNoDataVisibility = Visibility.Collapsed; + + // 是否正在获取数据 + // 在所有的退出分支中都需要设为true + IsEnabled = false; + + var tab = TabHeaders[SelectTabId]; + + await Task.Run(new Action(() => + { + CancellationToken cancellationToken = tokenSource2.Token; + + List medias = FavoritesResource.GetFavoritesMedia(tab.Id, current, VideoNumberInPage); + if (medias == null || medias.Count == 0) + { + MediaLoadingVisibility = Visibility.Collapsed; + MediaNoDataVisibility = Visibility.Visible; + return; + } + + MediaLoadingVisibility = Visibility.Collapsed; + MediaNoDataVisibility = Visibility.Collapsed; + + var service = new FavoritesService(); + service.GetFavoritesMediaList(medias, Medias, eventAggregator, cancellationToken); + }), (tokenSource2 = new CancellationTokenSource()).Token); + + IsEnabled = true; + } + + /// + /// 初始化页面数据 + /// + private void InitView() + { + ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark"); + + ContentVisibility = Visibility.Collapsed; + LoadingVisibility = Visibility.Visible; + NoDataVisibility = Visibility.Collapsed; + MediaLoadingVisibility = Visibility.Collapsed; + MediaNoDataVisibility = Visibility.Collapsed; + + TabHeaders.Clear(); + Medias.Clear(); + SelectTabId = -1; + } + + /// + /// 导航到VideoDetail页面时执行 + /// + /// + public override async void OnNavigatedTo(NavigationContext navigationContext) + { + base.OnNavigatedTo(navigationContext); + + // 根据传入参数不同执行不同任务 + mid = navigationContext.Parameters.GetValue("Parameter"); + if (mid == 0) + { + return; + } + + InitView(); + + await Task.Run(new Action(() => + { + CancellationToken cancellationToken = tokenSource1.Token; + + var service = new FavoritesService(); + service.GetCreatedFavorites(mid, TabHeaders, cancellationToken); + service.GetCollectedFavorites(mid, TabHeaders, cancellationToken); + }), (tokenSource1 = new CancellationTokenSource()).Token); + + if (TabHeaders.Count == 0) + { + ContentVisibility = Visibility.Collapsed; + LoadingVisibility = Visibility.Collapsed; + NoDataVisibility = Visibility.Visible; + + return; + } + + ContentVisibility = Visibility.Visible; + LoadingVisibility = Visibility.Collapsed; + NoDataVisibility = Visibility.Collapsed; + + // 初始选中项 + SelectTabId = 0; + + // 页面选择 + Pager = new CustomPagerViewModel(1, (int)Math.Ceiling(double.Parse(TabHeaders[0].SubTitle) / VideoNumberInPage)); + Pager.CurrentChanged += OnCurrentChanged_Pager; + Pager.CountChanged += OnCountChanged_Pager; + Pager.Current = 1; + } + + } +} diff --git a/src/DownKyi/ViewModels/ViewMySpaceViewModel.cs b/src/DownKyi/ViewModels/ViewMySpaceViewModel.cs index 82d2639..a7e4c92 100644 --- a/src/DownKyi/ViewModels/ViewMySpaceViewModel.cs +++ b/src/DownKyi/ViewModels/ViewMySpaceViewModel.cs @@ -340,7 +340,7 @@ namespace DownKyi.ViewModels switch (SelectedPackage) { case 0: - Console.WriteLine(SelectedPackage); + NavigateToView.NavigationView(eventAggregator, ViewMyFavoritesViewModel.Tag, Tag, mid); break; case 1: Console.WriteLine(SelectedPackage); diff --git a/src/DownKyi/ViewModels/ViewPublicFavoritesViewModel.cs b/src/DownKyi/ViewModels/ViewPublicFavoritesViewModel.cs index 20fac0f..a330123 100644 --- a/src/DownKyi/ViewModels/ViewPublicFavoritesViewModel.cs +++ b/src/DownKyi/ViewModels/ViewPublicFavoritesViewModel.cs @@ -1,5 +1,7 @@ -using DownKyi.Core.BiliApi.VideoStream; +using DownKyi.Core.BiliApi.Favorites; +using DownKyi.Core.BiliApi.VideoStream; using DownKyi.Core.Logging; +using DownKyi.CustomControl; using DownKyi.Events; using DownKyi.Images; using DownKyi.Services; @@ -11,7 +13,9 @@ using Prism.Events; using Prism.Regions; using Prism.Services.Dialogs; using System; +using System.Collections.Generic; using System.Collections.ObjectModel; +using System.Threading; using System.Threading.Tasks; using System.Windows; @@ -23,6 +27,8 @@ namespace DownKyi.ViewModels private readonly IDialogService dialogService; + private CancellationTokenSource tokenSource; + #region 页面属性申明 private string pageName = Tag; @@ -60,6 +66,21 @@ namespace DownKyi.ViewModels set => SetProperty(ref contentVisibility, value); } + + private GifImage loading; + public GifImage Loading + { + get => loading; + set => SetProperty(ref loading, value); + } + + private Visibility loadingVisibility; + public Visibility LoadingVisibility + { + get => loadingVisibility; + set => SetProperty(ref loadingVisibility, value); + } + private Visibility noDataVisibility; public Visibility NoDataVisibility { @@ -67,6 +88,27 @@ namespace DownKyi.ViewModels set => SetProperty(ref noDataVisibility, value); } + private GifImage mediaLoading; + public GifImage MediaLoading + { + get => mediaLoading; + set => SetProperty(ref mediaLoading, value); + } + + private Visibility mediaLoadingVisibility; + public Visibility MediaLoadingVisibility + { + get => mediaLoadingVisibility; + set => SetProperty(ref mediaLoadingVisibility, value); + } + + private Visibility mediaNoDataVisibility; + public Visibility MediaNoDataVisibility + { + get => mediaNoDataVisibility; + set => SetProperty(ref mediaNoDataVisibility, value); + } + #endregion public ViewPublicFavoritesViewModel(IEventAggregator eventAggregator, IDialogService dialogService) : base(eventAggregator) @@ -75,6 +117,17 @@ namespace DownKyi.ViewModels #region 属性初始化 + // 初始化loading gif + Loading = new GifImage(Properties.Resources.loading); + Loading.StartAnimate(); + LoadingVisibility = Visibility.Collapsed; + NoDataVisibility = Visibility.Collapsed; + + MediaLoading = new GifImage(Properties.Resources.loading); + MediaLoading.StartAnimate(); + MediaLoadingVisibility = Visibility.Collapsed; + MediaNoDataVisibility = Visibility.Collapsed; + ArrowBack = NavigationIcon.Instance().ArrowBack; ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark"); @@ -94,6 +147,9 @@ namespace DownKyi.ViewModels /// private void ExecuteBackSpace() { + // 结束任务 + tokenSource?.Cancel(); + NavigationParam parameter = new NavigationParam { ViewName = ParentView, @@ -238,7 +294,10 @@ namespace DownKyi.ViewModels ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark"); ContentVisibility = Visibility.Collapsed; + LoadingVisibility = Visibility.Collapsed; NoDataVisibility = Visibility.Collapsed; + MediaLoadingVisibility = Visibility.Collapsed; + MediaNoDataVisibility = Visibility.Collapsed; FavoritesMedias.Clear(); } @@ -246,24 +305,43 @@ namespace DownKyi.ViewModels /// /// 更新页面 /// - private void UpdateView(IFavoritesService favoritesService, long favoritesId) + private void UpdateView(IFavoritesService favoritesService, long favoritesId, CancellationToken cancellationToken) { + LoadingVisibility = Visibility.Visible; + Favorites = favoritesService.GetFavorites(favoritesId); if (Favorites == null) { LogManager.Debug(Tag, "Favorites is null."); ContentVisibility = Visibility.Collapsed; + LoadingVisibility = Visibility.Collapsed; NoDataVisibility = Visibility.Visible; return; } else { ContentVisibility = Visibility.Visible; + LoadingVisibility = Visibility.Collapsed; NoDataVisibility = Visibility.Collapsed; } - favoritesService.GetFavoritesMediaList(favoritesId, FavoritesMedias, eventAggregator); + MediaLoadingVisibility = Visibility.Visible; + + List medias = FavoritesResource.GetAllFavoritesMedia(favoritesId); + if (medias == null || medias.Count == 0) + { + MediaLoadingVisibility = Visibility.Collapsed; + MediaNoDataVisibility = Visibility.Visible; + return; + } + else + { + MediaLoadingVisibility = Visibility.Collapsed; + MediaNoDataVisibility = Visibility.Collapsed; + } + + favoritesService.GetFavoritesMediaList(medias, FavoritesMedias, eventAggregator, cancellationToken); } /// @@ -284,8 +362,10 @@ namespace DownKyi.ViewModels InitView(); await Task.Run(new Action(() => { - UpdateView(new FavoritesService(), parameter); - })); + CancellationToken cancellationToken = tokenSource.Token; + + UpdateView(new FavoritesService(), parameter, cancellationToken); + }), (tokenSource = new CancellationTokenSource()).Token); } } diff --git a/src/DownKyi/ViewModels/ViewPublicationViewModel.cs b/src/DownKyi/ViewModels/ViewPublicationViewModel.cs index 6ad5896..ae0be55 100644 --- a/src/DownKyi/ViewModels/ViewPublicationViewModel.cs +++ b/src/DownKyi/ViewModels/ViewPublicationViewModel.cs @@ -40,6 +40,13 @@ namespace DownKyi.ViewModels #region 页面属性申明 + private string pageName = Tag; + public string PageName + { + get => pageName; + set => SetProperty(ref pageName, value); + } + private GifImage loading; public GifImage Loading { @@ -147,7 +154,7 @@ namespace DownKyi.ViewModels ArrowBack.Fill = DictionaryResource.GetColor("ColorText"); // 结束任务 - tokenSource.Cancel(); + tokenSource?.Cancel(); NavigationParam parameter = new NavigationParam { @@ -261,6 +268,10 @@ namespace DownKyi.ViewModels #endregion + /// + /// 添加到下载 + /// + /// private async void AddToDownload(bool isOnlySelected) { // 收藏夹里只有视频 @@ -364,7 +375,7 @@ namespace DownKyi.ViewModels BitmapImage cover; if (coverUrl == null || coverUrl == "") { - cover = new BitmapImage(new Uri($"pack://application:,,,/Resources/video-placeholder.png")); + cover = null; // new BitmapImage(new Uri($"pack://application:,,,/Resources/video-placeholder.png")); } else { @@ -394,11 +405,11 @@ namespace DownKyi.ViewModels App.PropertyChangeAsync(new Action(() => { - PublicationMedia media = new PublicationMedia + PublicationMedia media = new PublicationMedia(eventAggregator) { Avid = video.Aid, Bvid = video.Bvid, - Cover = cover, + Cover = cover ?? new BitmapImage(new Uri($"pack://application:,,,/Resources/video-placeholder.png")), Duration = video.Length, Title = video.Title, PlayNumber = play, @@ -429,6 +440,7 @@ namespace DownKyi.ViewModels ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark"); TabHeaders.Clear(); + Medias.Clear(); SelectTabId = -1; } @@ -440,8 +452,6 @@ namespace DownKyi.ViewModels { base.OnNavigatedTo(navigationContext); - InitView(); - // 根据传入参数不同执行不同任务 var parameter = navigationContext.Parameters.GetValue>("Parameter"); if (parameter == null) @@ -449,6 +459,8 @@ namespace DownKyi.ViewModels return; } + InitView(); + mid = (long)parameter["mid"]; int tid = (int)parameter["tid"]; List zones = (List)parameter["list"]; diff --git a/src/DownKyi/ViewModels/ViewUserSpaceViewModel.cs b/src/DownKyi/ViewModels/ViewUserSpaceViewModel.cs index ad225bb..0770e55 100644 --- a/src/DownKyi/ViewModels/ViewUserSpaceViewModel.cs +++ b/src/DownKyi/ViewModels/ViewUserSpaceViewModel.cs @@ -225,7 +225,7 @@ namespace DownKyi.ViewModels regionManager.RequestNavigate("UserSpaceContentRegion", ViewArchiveViewModel.Tag, param); break; case 1: - regionManager.RequestNavigate("UserSpaceContentRegion", ViewChannelViewModel.Tag, param); + regionManager.RequestNavigate("UserSpaceContentRegion", UserSpace.ViewChannelViewModel.Tag, param); break; } } diff --git a/src/DownKyi/Views/Settings/ViewAbout.xaml b/src/DownKyi/Views/Settings/ViewAbout.xaml index f769594..ed8cd9d 100644 --- a/src/DownKyi/Views/Settings/ViewAbout.xaml +++ b/src/DownKyi/Views/Settings/ViewAbout.xaml @@ -350,7 +350,7 @@ Grid.Column="2" FontSize="12" Foreground="{DynamicResource BrushTextDark}" - Text="4.3.1" /> + Text="5.0" /> @@ -9,7 +10,16 @@ - + + + + + + diff --git a/src/DownKyi/Views/ViewChannel.xaml b/src/DownKyi/Views/ViewChannel.xaml new file mode 100644 index 0000000..9861189 --- /dev/null +++ b/src/DownKyi/Views/ViewChannel.xaml @@ -0,0 +1,310 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +